X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da175b2ce4dc35cc4c0baa8bbdc16bf4de6c7684..0906c58d0533380cd706b4de2a88615f0f187995:/src/motif/gauge.cpp diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp index a8fc4cb16d..8c0dda0668 100644 --- a/src/motif/gauge.cpp +++ b/src/motif/gauge.cpp @@ -9,18 +9,39 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "gauge.h" #endif -#include "wx/gauge.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" +#ifdef __VMS +#include +#undef XtDisplay +#undef XtScreen +#undef XtWindow +#undef XtIsRealized +#undef XtParent +#endif + +# include "wx/gauge.h" + +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include -#include +#ifdef __WXMOTIF20__ +#include +#endif // __WXMOTIF20__ +#ifdef __VMS__ +#pragma message enable nosimpint +#endif +#include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#endif + +#if !wxCHECK_MOTIF_VERSION( 2, 0 ) || wxCHECK_LESSTIF() // XmGauge copyright notice: @@ -43,7 +64,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 -* 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. * */ @@ -71,7 +92,7 @@ XmGaugeSetValue(Widget w, int value); int XmGaugeGetValue(Widget w); - +#endif // !wxCHECK_MOTIF_VERSION( 2, 0 ) || wxCHECK_LESSTIF() bool wxGauge::Create(wxWindow *parent, wxWindowID id, int range, @@ -81,25 +102,14 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - SetName(name); - SetValidator(validator); - m_rangeMax = range; - m_windowStyle = style; - m_backgroundColour = parent->GetBackgroundColour(); - m_foregroundColour = parent->GetForegroundColour(); - - if (parent) parent->AddChild(this); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - + if( !CreateControl( parent, id, pos, size, style, validator, name ) ) + return false; + Widget parentWidget = (Widget) parent->GetClientWidget(); - - Arg args[4]; + + Arg args[7]; int count = 4; - if (style & wxHORIZONTAL) + if (style & wxGA_HORIZONTAL) { XtSetArg (args[0], XmNorientation, XmHORIZONTAL); XtSetArg (args[1], XmNprocessingDirection, XmMAX_ON_RIGHT); @@ -111,27 +121,43 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id, } XtSetArg(args[2], XmNminimum, 0); XtSetArg(args[3], XmNmaximum, range); - Widget gaugeWidget = XtCreateManagedWidget("gauge", xmGaugeWidgetClass, parentWidget, args, count); +#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF() + XtSetArg(args[4], XmNeditable, False); ++count; + XtSetArg(args[5], XmNslidingMode, XmTHERMOMETER); ++count; + // XtSetArg(args[6], XmNsliderVisual, XmFOREGROUND_COLOR ); ++count; + Widget gaugeWidget = + XtCreateManagedWidget("gauge", xmScaleWidgetClass, + parentWidget, args, count); +#else + Widget gaugeWidget = + XtCreateManagedWidget("gauge", xmGaugeWidgetClass, + parentWidget, args, count); +#endif m_mainWidget = (WXWidget) 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; - - m_font = parent->GetFont(); - ChangeFont(FALSE); - - SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height); - + wxSize best = GetBestSize(); + if( size.x != -1 ) best.x = size.x; + if( size.y != -1 ) best.y = size.y; + + ChangeFont(false); + + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, + best.x, best.y); + ChangeBackgroundColour(); - - return TRUE; + + return true; +} + +wxSize wxGauge::DoGetBestSize() const +{ + if( HasFlag(wxGA_HORIZONTAL) ) + return wxSize( 100, 18 ); + else + return wxSize( 18, 100 ); } void wxGauge::SetShadowWidth(int w) @@ -141,19 +167,13 @@ void wxGauge::SetShadowWidth(int w) XtVaSetValues((Widget) m_mainWidget, XmNshadowThickness, w, NULL); } -void wxGauge::SetBezelFace(int w) -{ -} - void wxGauge::SetRange(int r) { - m_rangeMax = r; XtVaSetValues((Widget) m_mainWidget, XmNmaximum, r, NULL); } void wxGauge::SetValue(int pos) { - m_gaugePos = pos; XtVaSetValues((Widget) m_mainWidget, XmNvalue, pos, NULL); } @@ -164,17 +184,11 @@ int wxGauge::GetShadowWidth() const return (int)w; } -int wxGauge::GetBezelFace() const -{ - return 0; -} - int wxGauge::GetRange() const { int r; XtVaGetValues((Widget) m_mainWidget, XmNmaximum, &r, NULL); return (int)r; - // return m_rangeMax; } int wxGauge::GetValue() const @@ -182,23 +196,19 @@ int wxGauge::GetValue() const int pos; XtVaGetValues((Widget) m_mainWidget, XmNvalue, &pos, NULL); return pos; - // return m_gaugePos; -} - -void wxGauge::ChangeFont(bool keepOriginalSize) -{ - wxWindow::ChangeFont(keepOriginalSize); } -void wxGauge::ChangeBackgroundColour() +void wxGauge::DoMoveWindow(int x, int y, int width, int height) { - wxWindow::ChangeBackgroundColour(); + wxGaugeBase::DoMoveWindow( x, y, width, height ); +#ifdef __WXMOTIF20__ + XtVaSetValues( (Widget)m_mainWidget, + XmNscaleHeight, height, + NULL ); +#endif } -void wxGauge::ChangeForegroundColour() -{ - wxWindow::ChangeForegroundColour(); -} +#if !wxCHECK_MOTIF_VERSION( 2, 0 ) || wxCHECK_LESSTIF() //// PRIVATE DECLARATIONS FOR XMGAUGE @@ -209,7 +219,7 @@ typedef struct { int empty; } XmGaugeClassPart; -typedef struct _XmGaugeClassRec { +typedef struct _XmGaugeClassRec { CoreClassPart core_class; XmPrimitiveClassPart primitive_class; XmGaugeClassPart gauge_class; @@ -222,10 +232,10 @@ typedef struct _XmGaugePart{ int maximum; unsigned char orientation; unsigned char processingDirection; - + XtCallbackList dragCallback; XtCallbackList valueChangedCallback; - + /* private fields */ Boolean dragging; /* drag in progress ? */ int oldx, oldy; @@ -247,9 +257,9 @@ extern XmGaugeClassRec xmGaugeClassRec; void GaugePick(Widget w, XEvent *e, String *args, Cardinal *num_args); -void +void GaugeDrag(Widget w, XEvent *e, String *args, Cardinal *num_args); -void +void GaugeDrop(Widget w, XEvent *e, String *args, Cardinal *num_args); @@ -280,9 +290,9 @@ DrawSlider(XmGaugeWidget gw, Boolean clear) unsigned long backgr,foregr; XRectangle rects[1]; ***/ - + sht = gw->primitive.shadow_thickness; - + ratio = (float)THIS.value/ (float)(THIS.maximum - THIS.minimum); /***chubraev @@ -290,7 +300,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear) 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); @@ -299,7 +309,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear) 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) { @@ -307,7 +317,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); - + /***chubraev rects[0].x = sht; rects[0].y = sht; rects[0].width = size; rects[0].height = gw->core.height - 2 * sht; @@ -318,7 +328,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); - + /***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 +338,15 @@ DrawSlider(XmGaugeWidget gw, Boolean clear) /***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); ***/ - + 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) { @@ -344,7 +354,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); - + /***chubraev rects[0].x = sht; rects[0].y = sht; rects[0].width = gw->core.width - 2 * sht; rects[0].height = size; @@ -355,7 +365,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); - + /***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 +374,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear) /***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; @@ -373,7 +383,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear) XSetClipMask(XtDisplay(gw), THIS.gc, None); XSetForeground(XtDisplay(gw), THIS.gc, foregr); ***/ -#undef THIS +#undef THIS } /* Old code @@ -385,7 +395,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear) #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 - @@ -431,22 +441,22 @@ DrawSlider(XmGaugeWidget gw, Boolean clear) } break; } -#undef THIS +#undef THIS } #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; - + values.foreground = gw->primitive.foreground; THIS.gc = XtGetGC(new_w, GCForeground, &values); - -#undef THIS - + +#undef THIS + } @@ -457,7 +467,7 @@ Destroy(Widget w) XmGaugeWidget gw = (XmGaugeWidget)w; #define THIS gw->gauge XtReleaseGC(w, THIS.gc); -#undef THIS +#undef THIS } @@ -466,18 +476,18 @@ Destroy(Widget w) static Boolean SetValues( Widget cw, - Widget rw, + Widget WXUNUSED(rw), Widget nw, - ArgList args, - Cardinal *num_args ) + ArgList WXUNUSED(args), + Cardinal *WXUNUSED(num_args) ) { XmGaugeWidget cgw = (XmGaugeWidget)cw; XmGaugeWidget ngw = (XmGaugeWidget)nw; - + Boolean redraw = False; if(cgw->primitive.foreground != ngw->primitive.foreground) { XGCValues values; - + redraw = True; XtReleaseGC(nw, ngw->gauge.gc); values.foreground = ngw->primitive.foreground; @@ -493,12 +503,12 @@ SetValues( 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; - + sht = gw->primitive.shadow_thickness; _XmDrawShadows(XtDisplay(w), XtWindow(w), gw->primitive.top_shadow_GC, @@ -506,39 +516,39 @@ ExposeProc(Widget w, XEvent *event, Region r) 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}, - + {XmNminimum, XmCValue, XtRInt, sizeof(int), offset(minimum), XtRImmediate, (caddr_t)0}, - + {XmNmaximum, XmCValue, XtRInt, sizeof(int), offset(maximum), XtRImmediate, (caddr_t)100}, - + {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}, - + {XmNdragCallback, XmCCallback, XmRCallback, sizeof(XtCallbackList), offset(dragCallback), XtRImmediate, (caddr_t)NULL}, - + {XmNvalueChangedCallback, XmCCallback, XmRCallback, sizeof(XtCallbackList), offset(valueChangedCallback), XtRImmediate, (caddr_t)NULL}, - - + + #undef offset }; @@ -550,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 */ @@ -559,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 */ @@ -598,10 +608,10 @@ 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 */ + /* Commented out for a read-only gauge in wxWidgets */ #if 0 XmGaugeWidget gw = (XmGaugeWidget)w; #define THIS gw->gauge @@ -610,7 +620,7 @@ GaugePick(Widget w, XEvent *e, String *args, Cardinal *num_args) Boolean dragging = False; XButtonEvent *event = (XButtonEvent *)e; int x, y; - + x = event->x; y = event->y; sht = gw->primitive.shadow_thickness; @@ -619,10 +629,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); - - + + 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; @@ -658,29 +668,29 @@ GaugePick(Widget w, XEvent *e, String *args, Cardinal *num_args) 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) ) -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 */ + /* Commented out for a read-only gauge in wxWidgets */ #if 0 XmGaugeWidget gw = (XmGaugeWidget)w; #define THIS gw->gauge int sht, x, y, max, value; float ratio, nratio, size, nsize, fvalue, delta; XMotionEvent *event = (XMotionEvent *)e; - + if( ! THIS.dragging) return; - + 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) { @@ -706,21 +716,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; - + fvalue = (int)((float)THIS.maximum - (float)THIS.minimum) * (float)nsize / (float)max; value = round(fvalue); - + THIS.value = value; THIS.oldx = x; THIS.oldy = y; - + /* clear old slider only if it was larger */ DrawSlider(gw, (nsize < size)); - + { XmGaugeCallbackStruct call; - + if(NULL != THIS.dragCallback) { call.reason = XmCR_DRAG; call.event = e; @@ -728,20 +738,20 @@ GaugeDrag(Widget w, XEvent *e, String *args, Cardinal *num_args) XtCallCallbacks(w, XmNdragCallback, &call); } } -#undef THIS +#undef THIS #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 */ + /* Commented out for a read-only gauge in wxWidgets */ #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; @@ -750,7 +760,7 @@ GaugeDrop(Widget w, XEvent *e, String *args, Cardinal *num_args) XtCallCallbacks(w, XmNvalueChangedCallback, &call); } THIS.dragging = False; -#undef THIS +#undef THIS #endif } @@ -758,7 +768,7 @@ void XmGaugeSetValue(Widget w, int value) { XmGaugeWidget gw = (XmGaugeWidget)w; - + gw->gauge.value = value; DrawSlider(gw, True); XFlush(XtDisplay(w)); @@ -766,8 +776,10 @@ XmGaugeSetValue(Widget w, int value) int XmGaugeGetValue(Widget w) -{ +{ XmGaugeWidget gw = (XmGaugeWidget)w; - + return gw->gauge.value; } + +#endif // !wxCHECK_MOTIF_VERSION( 2, 0 ) || wxCHECK_LESSTIF()