ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-09-22 10:42:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

NOMINMAX definition has been moved into CONFIGURATION repository.

Browse Source
This commit is contained in:
rnv 2021-04-30 00:12:39 +03:00
parent ef169a51e2
commit f9cf20ad5b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
View File

@ -169,11 +169,7 @@ void GEOMToolsGUI_MarkerDlg::setStandardMarker( GEOM::marker_type type, GEOM::ma
myTypeGroup->button( 0 )->setChecked( true ); myTypeGroup->button( 0 )->setChecked( true );
myWGStack->setCurrentIndex( 0 ); myWGStack->setCurrentIndex( 0 );
myStdTypeCombo->setCurrentId( (int)type ); 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 ) ); int asize = std::max( (int)GEOM::MS_10, std::min( (int)GEOM::MS_70, (int)size ) );
#endif
myStdScaleCombo->setCurrentId( asize ); myStdScaleCombo->setCurrentId( asize );
} }
} }