From d8c14403f2332011ddb7919f3dbd75db9b763ddb Mon Sep 17 00:00:00 2001
From: Andrey Fedorushkov <andrf@mail.ru>
Date: Fri, 25 May 2012 18:33:58 +0400
Subject: [PATCH] eeschema: fix set bus width when define KICAD_GOST

---
 eeschema/dialogs/dialog_eeschema_options.cpp | 9 ---------
 eeschema/dialogs/dialog_eeschema_options.h   | 8 --------
 eeschema/eeschema_config.h                   | 7 -------
 eeschema/sch_line.cpp                        | 4 ----
 4 files changed, 28 deletions(-)

diff --git a/eeschema/dialogs/dialog_eeschema_options.cpp b/eeschema/dialogs/dialog_eeschema_options.cpp
index 7a1025ecb9..ae610214f2 100644
--- a/eeschema/dialogs/dialog_eeschema_options.cpp
+++ b/eeschema/dialogs/dialog_eeschema_options.cpp
@@ -37,15 +37,6 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( wxWindow* parent ) :
 {
     m_choiceUnits->SetFocus();
     m_sdbSizer1OK->SetDefault();
-
-#if defined (KICAD_GOST)
-
-    /* The GOST standard pre-defines certain schematic attributes that cannot be changed */
-
-    m_spinBusWidth->Enable(false);
-
-#endif
-
 }
 
 
diff --git a/eeschema/dialogs/dialog_eeschema_options.h b/eeschema/dialogs/dialog_eeschema_options.h
index 16dcf53d2a..d8c3ad6f92 100644
--- a/eeschema/dialogs/dialog_eeschema_options.h
+++ b/eeschema/dialogs/dialog_eeschema_options.h
@@ -47,20 +47,12 @@ public:
 
     void SetBusWidth( int aWidth )
     {
-#if defined( KICAD_GOST )
-        m_spinBusWidth->SetValue( GOST_BUS_WIDTH );
-#else
         m_spinBusWidth->SetValue( aWidth );
-#endif
     }
 
     int GetBusWidth( void )
     {
-#if defined( KICAD_GOST )
-        return GOST_BUS_WIDTH;
-#else
         return m_spinBusWidth->GetValue();
-#endif
     }
 
     void SetLineWidth( int aWidth ) { m_spinLineWidth->SetValue( aWidth ); }
diff --git a/eeschema/eeschema_config.h b/eeschema/eeschema_config.h
index cb6d6c23de..caa9025224 100644
--- a/eeschema/eeschema_config.h
+++ b/eeschema/eeschema_config.h
@@ -13,13 +13,6 @@
  */
 extern int g_DefaultBusWidth;
 
-#if defined(KICAD_GOST)
-
-/** In a GOST build, the bus width is set and cannot be changed */
-#define GOST_BUS_WIDTH      22
-
-#endif
-
 /* saving parameters option : */
 #define INSETUP true    /* used when the parameter is saved in general config
                          * if not used, the parameter is saved in the local
diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index d8e1c4d629..b5354ab6e2 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -214,11 +214,7 @@ int SCH_LINE::GetPenSize() const
 
     if( m_Layer == LAYER_BUS )
     {
-#if defined(KICAD_GOST)
-        pensize = GOST_BUS_WIDTH;
-#else
         pensize = ( m_width == 0 ) ? g_DefaultBusWidth : m_width;
-#endif
     }
 
     return pensize;