Commit f18fdd10 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

fixed issue for negative numbers starting by "-" in dialogs (read as 0) 

dixed very minor compil warnings
parents 6e6910da 9e3a0424

common/base_screen.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -456,6 +456,7 @@ void BASE_SCREEN::AddGrid( const wxRealPoint& size, UserUnitType aUnit, int id ) 
        y = size.y / 25.4;

        y = size.y / 25.4;

        break;

        break;





    default:

    case INCHES:

    case INCHES:

    case UNSCALED_UNITS:

    case UNSCALED_UNITS:

        x = size.x;

        x = size.x;

common/common.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -402,7 +402,8 @@ int ReturnValueFromString( UserUnitType aUnit, const wxString& TextValue, 
    while( brk_point < buf.Len() )

    while( brk_point < buf.Len() )

    {

    {

        wxChar ch = buf[brk_point];

        wxChar ch = buf[brk_point];

        if( !( (ch >= '0' && ch <='9') || (ch == decimal_point) ) )

        if( !( (ch >= '0' && ch <='9') || (ch == decimal_point)

             || (ch == '-') || (ch == '+') ) )

        {

        {

            break;

            break;

        }

        }
@@ -506,6 +507,7 @@ int From_User_Unit( UserUnitType aUnit, double val, int internal_unit_value ) 
        value = val * internal_unit_value;

        value = val * internal_unit_value;

        break;

        break;





    default:

    case UNSCALED_UNITS:

    case UNSCALED_UNITS:

        value = val;

        value = val;

    }

    }

common/gr_basic.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -143,6 +143,8 @@ int GRMapY( int y ) 
#define WHEN_INSIDE

#define WHEN_INSIDE









#if defined( USE_WX_ZOOM )

// currently only used if USE_WX_ZOOM is defined.

/**

/**

 * Test if any part of a line falls within the bounds of a rectangle.

 * Test if any part of a line falls within the bounds of a rectangle.

 *

 *
@@ -373,6 +375,8 @@ static bool clipLine( EDA_Rect* aClipBox, int& x1, int& y1, int& x2, int& y2 ) 




    return true;

    return true;

}

}

#endif      // if defined( USE_WX_ZOOM )







/**

/**

 * Function clip_line

 * Function clip_line