/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.cpp
+// Name: src/motif/gauge.cpp
// Purpose: wxGauge class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "gauge.h"
+// 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
+#undef XtClass
#endif
#include "wx/gauge.h"
+#ifndef WX_PRECOMP
+ #include "wx/math.h"
+#endif
+
+#ifdef __OS2__
+#include <types.h>
+#endif
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
+#ifdef __WXMOTIF20__
+#include <Xm/Scale.h>
+#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:
*/
//// PUBLIC XMGAUGE DECLARATIONS
-typedef struct _XmGaugeClassRec* XmGaugeWidgetClass;
-typedef struct _XmGaugeRec* XmGaugeWidget;
+typedef struct _XmGaugeClassRec* XmGaugeWidgetClass;
+typedef struct _XmGaugeRec* XmGaugeWidget;
#ifdef __cplusplus
extern "C" WidgetClass xmGaugeWidgetClass;
int
XmGaugeGetValue(Widget w);
-
+#endif // !wxCHECK_MOTIF_VERSION( 2, 0 ) || wxCHECK_LESSTIF()
bool wxGauge::Create(wxWindow *parent, wxWindowID id,
int range,
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);
}
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;
+ wxSize best = GetBestSize();
+ if( size.x != wxDefaultCoord ) best.x = size.x;
+ if( size.y != wxDefaultCoord ) best.y = size.y;
- m_font = parent->GetFont();
- ChangeFont(FALSE);
+ ChangeFont(false);
- SetCanAddEventHandler(TRUE);
- AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height);
+ 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)
XtVaSetValues((Widget) m_mainWidget, XmNshadowThickness, w, NULL);
}
-void wxGauge::SetBezelFace(int WXUNUSED(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);
}
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
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
} XmGaugeClassPart;
typedef struct _XmGaugeClassRec {
- CoreClassPart core_class;
- XmPrimitiveClassPart primitive_class;
- XmGaugeClassPart gauge_class;
+ CoreClassPart core_class;
+ XmPrimitiveClassPart primitive_class;
+ XmGaugeClassPart gauge_class;
} XmGaugeClassRec;
XtCallbackList valueChangedCallback;
/* private fields */
- Boolean dragging; /* drag in progress ? */
+ Boolean dragging; /* drag in progress ? */
int oldx, oldy;
GC gc;
} XmGaugePart;
typedef struct _XmGaugeRec {
- CorePart core;
- XmPrimitivePart primitive;
- XmGaugePart gauge;
+ CorePart core;
+ XmPrimitivePart primitive;
+ XmGaugePart gauge;
} XmGaugeRec;
extern XmGaugeClassRec xmGaugeClassRec;
}
switch(THIS.orientation) {
case XmHORIZONTAL:
- /* size = (gw->core.width - 2 * sht) / ratio; */
+ /* size = (gw->core.width - 2 * sht) / ratio; */
/* A fix suggested by Dmitri Chubraev */
size = (gw->core.width - 2 * sht) /((float)THIS.maximum-(float)THIS.minimum)*(float)THIS.value;
switch(THIS.processingDirection) {
break;
case XmVERTICAL:
size = (gw->core.height - 2 * sht) /((float)THIS.maximum-(float)THIS.minimum)*(float)THIS.value;
- /* size = (gw->core.height - 2 * sht)/ ratio; */
+ /* size = (gw->core.height - 2 * sht)/ ratio; */
switch(THIS.processingDirection) {
case XmMAX_ON_RIGHT:
case XmMAX_ON_BOTTOM:
gw->primitive.top_shadow_GC,
gw->primitive.bottom_shadow_GC,
0, 0, w->core.width, w->core.height,
- sht, XmSHADOW_IN);
+ (Dimension)sht, XmSHADOW_IN);
DrawSlider(gw, False);
#undef THIS
}
XmGaugeClassRec xmGaugeClassRec = {
- { /* core fields */
- (WidgetClass) &xmPrimitiveClassRec, /* superclass */
- "XmGauge", /* class_name */
- sizeof(XmGaugeRec), /* widget_size */
- NULL, /* class_initialize */
- NULL, /* class_part_initialize */
- FALSE, /* class_inited */
- Initialize, /* initialize */
- NULL, /* initialize_hook */
- XtInheritRealize, /* realize */
- actions, /* actions */
- XtNumber(actions), /* num_actions */
- resources, /* resources */
- XtNumber(resources), /* num_resources */
- NULLQUARK, /* xrm_class */
- TRUE, /* compress_motion */
- TRUE, /* compress_exposure */
- TRUE, /* compress_enterleave */
- FALSE, /* visible_interest */
- Destroy, /* destroy */
- NULL, /* resize */
- ExposeProc, /* expose */
- SetValues, /* set_values */
- NULL, /* set_values_hook */
- XtInheritSetValuesAlmost, /* set_values_almost */
- NULL, /* get_values_hook */
- NULL, /* accept_focus */
- XtVersion, /* version */
- NULL, /* callback_private */
- translations, /* tm_table */
- NULL, /* query_geometry */
- NULL, /* display_accelerator */
- NULL /* extension */
+ { /* core fields */
+ (WidgetClass) &xmPrimitiveClassRec, /* superclass */
+ "XmGauge", /* class_name */
+ sizeof(XmGaugeRec), /* widget_size */
+ NULL, /* class_initialize */
+ NULL, /* class_part_initialize */
+ False, /* class_inited */
+ Initialize, /* initialize */
+ NULL, /* initialize_hook */
+ XtInheritRealize, /* realize */
+ actions, /* actions */
+ XtNumber(actions), /* num_actions */
+ resources, /* resources */
+ XtNumber(resources), /* num_resources */
+ NULLQUARK, /* xrm_class */
+ True, /* compress_motion */
+ True, /* compress_exposure */
+ True, /* compress_enterleave */
+ False, /* visible_interest */
+ Destroy, /* destroy */
+ NULL, /* resize */
+ ExposeProc, /* expose */
+ SetValues, /* set_values */
+ NULL, /* set_values_hook */
+ XtInheritSetValuesAlmost, /* set_values_almost */
+ NULL, /* get_values_hook */
+ NULL, /* accept_focus */
+ XtVersion, /* version */
+ NULL, /* callback_private */
+ translations, /* tm_table */
+ NULL, /* query_geometry */
+ NULL, /* display_accelerator */
+ NULL /* extension */
},
- /* primitive_class fields */
+ /* primitive_class fields */
{
- NULL, /* border_highlight */
- NULL, /* border_unhighlight */
- NULL, /* translations */
- NULL, /* arm_and_activate */
- NULL, /* syn_resources */
- 0, /* num_syn_resources */
- NULL /* extension */
- },
- { /* gauge fields */
- 0 /* empty */
- }
+ NULL, /* border_highlight */
+ NULL, /* border_unhighlight */
+ NULL, /* translations */
+ NULL, /* arm_and_activate */
+ NULL, /* syn_resources */
+ 0, /* num_syn_resources */
+ NULL /* extension */
+ },
+ { /* gauge fields */
+ 0 /* empty */
+ }
};
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
#endif
}
-#define round(x) ( (x) > 0 ? ((x) + 0.5) : -(-(x) + 0.5) )
-
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
fvalue = (int)((float)THIS.maximum -
(float)THIS.minimum) * (float)nsize / (float)max;
- value = round(fvalue);
+ value = wxRound(fvalue);
THIS.value = value;
THIS.oldx = x;
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
return gw->gauge.value;
}
+
+#endif // !wxCHECK_MOTIF_VERSION( 2, 0 ) || wxCHECK_LESSTIF()
projects / wxWidgets.git / blobdiff