From 642d1f2ea63d0385609dc818a002cca48fa1451d Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 12 Jul 2010 21:28:38 +0200 Subject: [PATCH] fixed very minor compil warnings. (no bugs) --- common/base_screen.cpp | 1 + common/common.cpp | 3 ++- common/gr_basic.cpp | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/base_screen.cpp b/common/base_screen.cpp index f0f042e157..a77175b2e5 100644 --- a/common/base_screen.cpp +++ b/common/base_screen.cpp @@ -456,6 +456,7 @@ void BASE_SCREEN::AddGrid( const wxRealPoint& size, UserUnitType aUnit, int id ) y = size.y / 25.4; break; + default: case INCHES: case UNSCALED_UNITS: x = size.x; diff --git a/common/common.cpp b/common/common.cpp index 39c51977d3..287b519b50 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -367,7 +367,7 @@ wxString ReturnStringFromValue( UserUnitType aUnit, int aValue, int aInternal_Un case MILLIMETRES: StringValue += _( " mm" ); break; - + case UNSCALED_UNITS: break; } @@ -506,6 +506,7 @@ int From_User_Unit( UserUnitType aUnit, double val, int internal_unit_value ) value = val * internal_unit_value; break; + default: case UNSCALED_UNITS: value = val; } diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp index 1251c59929..08a09dfbff 100644 --- a/common/gr_basic.cpp +++ b/common/gr_basic.cpp @@ -143,6 +143,8 @@ int GRMapY( int y ) #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. * @@ -373,6 +375,8 @@ static bool clipLine( EDA_Rect* aClipBox, int& x1, int& y1, int& x2, int& y2 ) return true; } +#endif // if defined( USE_WX_ZOOM ) + /** * Function clip_line