Salome HOME
projects
/
modules
/
geom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ef169a5
)
NOMINMAX definition has been moved into CONFIGURATION repository.
rnv/64ids_win
V9_7_0rc1
author
rnv
<rnv@opencascade.com>
Thu, 29 Apr 2021 21:12:39 +0000
(
00:12
+0300)
committer
rnv
<rnv@opencascade.com>
Thu, 29 Apr 2021 21:12:39 +0000
(
00:12
+0300)
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
patch
|
blob
|
history
diff --git
a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
index 38e58971bb66bab6d9a12b048f8a7b4bf963ae13..d719134adacf63e428f3cdeeda503317ac17bf41 100644
(file)
--- a/
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
+++ b/
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
@@
-169,11
+169,7
@@
void GEOMToolsGUI_MarkerDlg::setStandardMarker( GEOM::marker_type type, GEOM::ma
myTypeGroup->button( 0 )->setChecked( true );
myWGStack->setCurrentIndex( 0 );
myStdTypeCombo->setCurrentId( (int)type );
-#ifdef WIN32
- int asize = max( (int)GEOM::MS_10, min( (int)GEOM::MS_70, (int)size ) );
-#else
int asize = std::max( (int)GEOM::MS_10, std::min( (int)GEOM::MS_70, (int)size ) );
-#endif
myStdScaleCombo->setCurrentId( asize );
}
}