diff --git a/common/basicframe.cpp b/common/basicframe.cpp index 149a232a8e..0c06bde3b2 100644 --- a/common/basicframe.cpp +++ b/common/basicframe.cpp @@ -509,13 +509,6 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event ) tmp << wxT( "OFF\n" ); #endif - tmp << wxT( " KICAD_GOST=" ); -#ifdef KICAD_GOST - tmp << wxT( "ON\n" ); -#else - tmp << wxT( "OFF\n" ); -#endif - tmp << wxT( " USE_WX_GRAPHICS_CONTEXT=" ); #ifdef USE_WX_GRAPHICS_CONTEXT tmp << wxT( "ON\n" ); diff --git a/common/class_page_info.cpp b/common/class_page_info.cpp index 0d458c279d..6e0671dd69 100644 --- a/common/class_page_info.cpp +++ b/common/class_page_info.cpp @@ -63,7 +63,6 @@ const wxString PAGE_INFO::Custom( wxT( "User" ) ); #define MMsize( x, y ) wxSize( Mm2mils( x ), Mm2mils( y ) ) // All MUST be defined as landscape. -// If IsGOST() is true, A4 is dynamically rotated later. const PAGE_INFO PAGE_INFO::pageA4( MMsize( 297, 210 ), wxT( "A4" ), wxPAPER_A4 ); const PAGE_INFO PAGE_INFO::pageA3( MMsize( 420, 297 ), wxT( "A3" ), wxPAPER_A3 ); const PAGE_INFO PAGE_INFO::pageA2( MMsize( 594, 420 ), wxT( "A2" ), wxPAPER_A2 ); @@ -127,16 +126,13 @@ inline void PAGE_INFO::updatePortrait() PAGE_INFO::PAGE_INFO( const wxSize& aSizeMils, const wxString& aType, wxPaperSize aPaperId ) : - m_type( aType ), - m_size( aSizeMils ), - m_paper_id( aPaperId ) + m_type( aType ), m_size( aSizeMils ), m_paper_id( aPaperId ) { updatePortrait(); // This constructor is protected, and only used by const PAGE_INFO's known // only to class implementation, so no further changes to "this" object are - // expected. Therefore we should also setMargin() again when copying this - // object in SetType() so that a runtime IsGOST() change does not break. + // expected. } diff --git a/common/page_layout/title_block_shapes.cpp b/common/page_layout/title_block_shapes.cpp index d5d14411d2..dfd9d533ca 100644 --- a/common/page_layout/title_block_shapes.cpp +++ b/common/page_layout/title_block_shapes.cpp @@ -85,7 +85,6 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( #endif #define milsTomm (25.4/1000) - #define mmTomils (1000/25.4) m_titleBlock = &aTitleBlock; m_paperFormat = &aPageInfo.GetType();