From 144060579941fc34af74e6418e633d8e49ab32eb Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Wed, 4 Jun 2014 11:12:29 +0000 Subject: [PATCH] fixing regression where gui spindial values were limited to integer (from [16230]) refs #36 git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk/sumo@16518 afbd958f-9f77-42d5-a016-97a22340ccf4 --- src/utils/foxtools/FXRealSpinDial.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/foxtools/FXRealSpinDial.cpp b/src/utils/foxtools/FXRealSpinDial.cpp index c385adb68fc..c55724a929b 100644 --- a/src/utils/foxtools/FXRealSpinDial.cpp +++ b/src/utils/foxtools/FXRealSpinDial.cpp @@ -462,7 +462,8 @@ FXRealSpinDial::FXRealSpinDial(FXComposite* p, FXint cols, FXObject* tgt, FXSele upButton = new FXRealSpinDialBtn(this, this, ID_INCREMENT, FRAME_RAISED | FRAME_THICK | ARROW_UP | ARROW_REPEAT, 0, 0, 0, 0, 0, 0, 0, 0); downButton = new FXRealSpinDialBtn(this, this, ID_DECREMENT, FRAME_RAISED | FRAME_THICK | ARROW_DOWN | ARROW_REPEAT, 0, 0, 0, 0, 0, 0, 0, 0); // flag SPINDIAL_NOMAX collides with flag TEXTFIELD_PASSWORD - textField = new FXRealSpinDialText(this, cols, this, ID_ENTRY, (opts & ~SPINDIAL_NOMAX) | TEXTFIELD_REAL | JUSTIFY_RIGHT, 0, 0, 0, 0, pl, pr, pt, pb); + // flag SPINDIAL_NOMIN collides with flag TEXTFIELD_INTEGER + textField = new FXRealSpinDialText(this, cols, this, ID_ENTRY, (opts & ~(SPINDIAL_NOMAX | SPINDIAL_NOMIN)) | TEXTFIELD_REAL | JUSTIFY_RIGHT, 0, 0, 0, 0, pl, pr, pt, pb); textField->setText("0"); range[0] = (options & SPINDIAL_NOMIN) ? -DBL_MAX : 0; range[1] = (options & SPINDIAL_NOMAX) ? DBL_MAX : 100;