From f9cf20ad5b28991bc130f571c79bd530d3d1ffdf Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 30 Apr 2021 00:12:39 +0300 Subject: [PATCH] NOMINMAX definition has been moved into CONFIGURATION repository. --- src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx index 38e58971b..d719134ad 100644 --- 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 ); } } -- 2.39.2