X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMToolsGUI%2FGEOMToolsGUI_MarkerDlg.cxx;h=4ff6bcec0be9eeae7e24f39fc3f927819bc3527d;hb=c1d63ef1f803d255b61ee99fb618bf471add07f4;hp=d15fcee7350cdf7294d08bb4be396bad730df14d;hpb=e416f88e1451b70473027d8de401d5dd3fa168b0;p=modules%2Fgeom.git diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx index d15fcee73..4ff6bcec0 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2023 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -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 ); } }