Pcbnew: fix Bug #1167364

pcb_calculator: fix bug Bug #1167345

pcb_calculator/dialogs/pcb_calculator_frame_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Mar 17 2012)
+// C++ code generated with wxFormBuilder (version Oct  8 2012)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -11,7 +11,11 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include "UnitSelector.h"
+class UNIT_SELECTOR_ANGLE;
+class UNIT_SELECTOR_FREQUENCY;
+class UNIT_SELECTOR_LEN;
+class UNIT_SELECTOR_RESISTOR;
+
 #include <wx/string.h>
 #include <wx/menu.h>
 #include <wx/gdicmn.h>

pcbnew/kicad_plugin.cpp

@@ -1087,8 +1087,10 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
         m_out->Print( 0, " (rect_delta %s )", FMT_IU( aPad->GetDelta() ).c_str() );
 
     wxSize sz = aPad->GetDrillSize();
+    wxPoint shapeoffset = aPad->GetOffset();
 
-    if( (sz.GetWidth() > 0) || (sz.GetHeight() > 0) )
+    if( (sz.GetWidth() > 0) || (sz.GetHeight() > 0) ||
+        (shapeoffset.x > 0) || (shapeoffset.y > 0) )
     {
         m_out->Print( 0, " (drill" );
 
@@ -1101,7 +1103,7 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
         if( sz.GetHeight() > 0  && sz.GetWidth() != sz.GetHeight() )
             m_out->Print( 0,  " %s", FMT_IU( sz.GetHeight() ).c_str() );
 
-        if( (aPad->GetOffset().x != 0) || (aPad->GetOffset().y != 0) )
+        if( (shapeoffset.x != 0) || (shapeoffset.y != 0) )
             m_out->Print( 0, " (offset %s)", FMT_IU( aPad->GetOffset() ).c_str() );
 
         m_out->Print( 0, ")" );