Mostly EAGLE_PLUGIN work:

* Derive the pcbnew copper zone and non-copper zone dialog windows from DIAG_SHIM,
  which injects some template code.
* Update UIpolicies.txt to talk about DIALOG_SHIM support.
* Add zone support to eagle_plugin.
* Organize ZONE_CONTAINER class declaration for future privacy and accessors.

Documentation/guidelines/UIpolicies.txt

@@ -42,6 +42,14 @@ Dialogs:
     leaving them all bundled tightly together.  The dialog box should look
     nice at any size large enough to show all the components.
 
+    When using wxFormBuilder, please add the following settings to the
+    "Dialog" node:
+        subclass.name   <- DIALOG_SHIM
+        subclass.header <- dialog_shim.h
+
+    This will provide for an override of the Show( bool ) wxWindow() function
+    and provide retentitive size and position for the session.
+
     Use tooltips to explain the functionality of each non-obvious control.
     This is important because the help files and the wiki often lag behind
     the source code.

pcbnew/class_board.cpp

@@ -1468,7 +1468,7 @@ int BOARD::SetAreasNetCodesFromNetNames( void )
 
         if( GetArea( ii )->GetNet() != 0 )      // i.e. if this zone is connected to a net
         {
-            const NETINFO_ITEM* net = FindNet( GetArea( ii )->m_Netname );
+            const NETINFO_ITEM* net = FindNet( GetArea( ii )->GetNetName() );
 
             if( net )
             {

pcbnew/class_zone.cpp

@@ -74,6 +74,7 @@ ZONE_CONTAINER::ZONE_CONTAINER( const ZONE_CONTAINER& aZone ) :
 
     // For corner moving, corner index to drag, or -1 if no selection
     m_CornerSelection = -1;
+    m_IsFilled = aZone.m_IsFilled;
     m_ZoneClearance = aZone.m_ZoneClearance;     // clearance value
     m_ZoneMinThickness = aZone.m_ZoneMinThickness;
     m_FillMode = aZone.m_FillMode;               // Filling mode (segments/polygons)
@@ -84,6 +85,11 @@ ZONE_CONTAINER::ZONE_CONTAINER( const ZONE_CONTAINER& aZone ) :
     m_ThermalReliefCopperBridge = aZone.m_ThermalReliefCopperBridge;
     m_FilledPolysList = aZone.m_FilledPolysList;
     m_FillSegmList = aZone.m_FillSegmList;
+
+    cornerSmoothingType = aZone.cornerSmoothingType;
+    cornerRadius = aZone.cornerRadius;
+    utility    = aZone.utility;
+    utility2   = aZone.utility;
 }
 
 
@@ -717,7 +723,7 @@ void ZONE_CONTAINER::DisplayInfo( EDA_DRAW_FRAME* frame )
     frame->AppendMsgPanel( _( "Corners" ), msg, BLUE );
 
     if( m_FillMode )
-        msg.Printf( _( "Segments" ), m_FillMode );
+        msg = _( "Segments" );
     else
         msg = _( "Polygons" );
 

pcbnew/class_zone.h

@@ -77,58 +77,7 @@ struct SEGMENT
 class ZONE_CONTAINER : public BOARD_CONNECTED_ITEM
 {
 public:
-    wxString              m_Netname;                        // Net Name
-    CPolyLine*            m_Poly;                           // outlines
-
-    // For corner moving, corner index to drag, or -1 if no selection.
-    int                   m_CornerSelection;
-    int                   m_ZoneClearance;                  // clearance value
-    int                   m_ZoneMinThickness;               // Min thickness value in filled areas
-
-    // How to fill areas: 0 = use filled polygons, != 0 fill with segments.
-    int                   m_FillMode;
-
-    // number of segments to convert a circle to a polygon (uses
-    //ARC_APPROX_SEGMENTS_COUNT_LOW_DEF or ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF)
-    int                   m_ArcToSegmentsCount;
-
-    // thickness of the gap in thermal reliefs.
-    int                   m_ThermalReliefGap;
-
-    // thickness of the copper bridge in thermal reliefs
-    int                   m_ThermalReliefCopperBridge;
-    int                   utility, utility2;                // flags used in polygon calculations
-
-    // true when a zone was filled, false after deleting the filled areas
-    bool                  m_IsFilled;
-
-    /* set of filled polygons used to draw a zone as a filled area.
-     * from outlines (m_Poly) but unlike m_Poly these filled polygons have no hole
-     * (they are* all in one piece)  In very simple cases m_FilledPolysList is same
-     * as m_Poly.  In less simple cases (when m_Poly has holes) m_FilledPolysList is
-     * a polygon equivalent to m_Poly, without holes but with extra outline segment
-     * connecting "holes" with external main outline.  In complex cases an outline
-     * described by m_Poly can have many filled areas
-     */
-    std::vector <CPolyPt> m_FilledPolysList;
-
-    /* set of segments used to fill area, when fill zone by segment is used.
-     *  ( m_FillMode == 1 )
-     *  in this case segments have m_ZoneMinThickness width
-     */
-    std::vector <SEGMENT> m_FillSegmList;
 
-private:
-    CPolyLine*            smoothedPoly;         // Corner-smoothed version of m_Poly
-    int                   cornerSmoothingType;
-    unsigned int          cornerRadius;
-    // Priority: when a zone outline is inside and other zone, if its priority is higher
-    // the other zone priority, it will be created inside.
-    // if priorities are equal, a DRC error is set
-    unsigned              m_priority;
-    ZoneConnection        m_PadConnection;
-
-public:
     ZONE_CONTAINER( BOARD* parent );
 
     ZONE_CONTAINER( const ZONE_CONTAINER& aZone );
@@ -547,6 +496,59 @@ public:
 #if defined(DEBUG)
     void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override
 #endif
+
+
+    CPolyLine*            m_Poly;                           // outlines
+
+    // For corner moving, corner index to drag, or -1 if no selection.
+    int                   m_CornerSelection;
+    int                   m_ZoneClearance;                  // clearance value
+    int                   m_ZoneMinThickness;               // Min thickness value in filled areas
+
+    // How to fill areas: 0 = use filled polygons, != 0 fill with segments.
+    int                   m_FillMode;
+
+    // number of segments to convert a circle to a polygon (uses
+    //ARC_APPROX_SEGMENTS_COUNT_LOW_DEF or ARC_APPROX_SEGMENTS_COUNT_HIGHT_DEF)
+    int                   m_ArcToSegmentsCount;
+
+    // thickness of the gap in thermal reliefs.
+    int                   m_ThermalReliefGap;
+
+    // thickness of the copper bridge in thermal reliefs
+    int                   m_ThermalReliefCopperBridge;
+    int                   utility, utility2;                // flags used in polygon calculations
+
+    // true when a zone was filled, false after deleting the filled areas
+    bool                  m_IsFilled;
+
+    /* set of filled polygons used to draw a zone as a filled area.
+     * from outlines (m_Poly) but unlike m_Poly these filled polygons have no hole
+     * (they are* all in one piece)  In very simple cases m_FilledPolysList is same
+     * as m_Poly.  In less simple cases (when m_Poly has holes) m_FilledPolysList is
+     * a polygon equivalent to m_Poly, without holes but with extra outline segment
+     * connecting "holes" with external main outline.  In complex cases an outline
+     * described by m_Poly can have many filled areas
+     */
+    std::vector <CPolyPt> m_FilledPolysList;
+
+    /* set of segments used to fill area, when fill zone by segment is used.
+     *  ( m_FillMode == 1 )
+     *  in this case segments have m_ZoneMinThickness width
+     */
+    std::vector <SEGMENT> m_FillSegmList;
+
+
+private:
+    wxString              m_Netname;                        // Net Name
+    CPolyLine*            smoothedPoly;         // Corner-smoothed version of m_Poly
+    int                   cornerSmoothingType;
+    unsigned int          cornerRadius;
+    // Priority: when a zone outline is inside and other zone, if its priority is higher
+    // the other zone priority, it will be created inside.
+    // if priorities are equal, a DRC error is set
+    unsigned              m_priority;
+    ZoneConnection        m_PadConnection;
 };
 
 

pcbnew/dialogs/dialog_copper_zones.cpp

@@ -56,9 +56,6 @@ private:
 
     wxListView*     m_LayerSelectionCtrl;
 
-    static wxPoint  prevPosition;           ///< Dialog position & size
-    static wxSize   prevSize;
-
     /**
      * Function initDialog
      * fills in the dialog controls using the current settings.
@@ -108,8 +105,6 @@ private:
 
 // Initialize static member variables
 wxString DIALOG_COPPER_ZONE::m_netNameShowFilter( wxT( "*" ) );
-wxPoint DIALOG_COPPER_ZONE::prevPosition( -1, -1 );
-wxSize DIALOG_COPPER_ZONE::prevSize;
 
 
 ZONE_EDIT_T InvokeCopperZonesEditor( PCB_BASE_FRAME* aCaller, ZONE_SETTINGS* aSettings )
@@ -157,10 +152,6 @@ DIALOG_COPPER_ZONE::DIALOG_COPPER_ZONE( PCB_BASE_FRAME* aParent, ZONE_SETTINGS*
 
     GetSizer()->SetSizeHints( this );
 
-    if( prevPosition.x != -1 )
-        SetSize( prevPosition.x, prevPosition.y,
-                 prevSize.x, prevSize.y );
-    else
     Center();
 }
 
@@ -169,8 +160,6 @@ void DIALOG_COPPER_ZONE::initDialog()
 {
     BOARD* board = m_Parent->GetBoard();
 
-    SetFocus();     // Required under wxGTK if we want to demiss the dialog with the ESC key
-
     wxString msg;
 
     if( m_settings.m_Zone_45_Only )
@@ -297,8 +286,6 @@ void DIALOG_COPPER_ZONE::OnButtonCancelClick( wxCommandEvent& event )
 void DIALOG_COPPER_ZONE::OnButtonOkClick( wxCommandEvent& event )
 {
     m_netNameShowFilter = m_ShowNetNameFilter->GetValue();
-    prevPosition = GetPosition();
-    prevSize = GetSize();
 
     if( AcceptOptions( true ) )
     {
@@ -311,9 +298,6 @@ void DIALOG_COPPER_ZONE::OnButtonOkClick( wxCommandEvent& event )
 // called on system close button
 void DIALOG_COPPER_ZONE::OnClose( wxCloseEvent& event )
 {
-    prevPosition = GetPosition();
-    prevSize = GetSize();
-
     if( m_OnExitCode != ZONE_ABORT )
         *m_ptr = m_settings;
 
@@ -384,7 +368,7 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab
     wxString txtvalue = m_ZoneClearanceCtrl->GetValue();
     m_settings.m_ZoneClearance = ReturnValueFromString( g_UserUnit, txtvalue );
 
-    // Test if this is a reasonnable value for this parameter
+    // Test if this is a reasonable value for this parameter
     // A too large value can hang Pcbnew
     #define CLEARANCE_MAX_VALUE 5000    // in 1/10000 inch
     if( m_settings.m_ZoneClearance > CLEARANCE_MAX_VALUE )
@@ -519,9 +503,6 @@ void DIALOG_COPPER_ZONE::OnNetSortingOptionSelected( wxCommandEvent& event )
 
 void DIALOG_COPPER_ZONE::ExportSetupToOtherCopperZones( wxCommandEvent& event )
 {
-    prevPosition = GetPosition();
-    prevSize = GetSize();
-
     if( !AcceptOptions( true, true ) )
         return;
 

pcbnew/dialogs/dialog_copper_zones_base.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
+// C++ code generated with wxFormBuilder (version Apr 11 2012)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -9,7 +9,7 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-BEGIN_EVENT_TABLE( DIALOG_COPPER_ZONE_BASE, wxDialog )
+BEGIN_EVENT_TABLE( DIALOG_COPPER_ZONE_BASE, DIALOG_SHIM )
 	EVT_CLOSE( DIALOG_COPPER_ZONE_BASE::_wxFB_OnClose )
 	EVT_SIZE( DIALOG_COPPER_ZONE_BASE::_wxFB_OnSize )
 	EVT_CHOICE( ID_M_NETDISPLAYOPTION, DIALOG_COPPER_ZONE_BASE::_wxFB_OnNetSortingOptionSelected )
@@ -23,7 +23,7 @@ BEGIN_EVENT_TABLE( DIALOG_COPPER_ZONE_BASE, wxDialog )
 	EVT_BUTTON( wxID_CANCEL, DIALOG_COPPER_ZONE_BASE::_wxFB_OnButtonCancelClick )
 END_EVENT_TABLE()
 
-DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
@@ -38,6 +38,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	m_staticText17->Wrap( -1 );
 	m_layerSizer->Add( m_staticText17, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
 	
+	
 	m_OptionsBoxSizer->Add( m_layerSizer, 1, wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizer7;
@@ -50,6 +51,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	m_ListNetNameSelection = new wxListBox( this, ID_NETNAME_SELECTION, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
 	bSizer7->Add( m_ListNetNameSelection, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
+	
 	m_OptionsBoxSizer->Add( bSizer7, 1, wxEXPAND, 5 );
 	
 	wxStaticBoxSizer* m_NetSortOptSizer;
@@ -86,8 +88,10 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	m_buttonRunFilter = new wxButton( this, wxID_APPLY_FILTERS, _("Apply Filters"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_NetSortOptSizer->Add( m_buttonRunFilter, 0, wxALL|wxEXPAND, 5 );
 	
+	
 	m_OptionsBoxSizer->Add( m_NetSortOptSizer, 0, wxALL, 5 );
 	
+	
 	m_MainBoxSizer->Add( m_OptionsBoxSizer, 1, wxALL|wxEXPAND, 5 );
 	
 	wxStaticBoxSizer* m_ExportableSetupSizer;
@@ -129,6 +133,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	m_cornerSmoothingCtrl = new wxTextCtrl( this, ID_M_CORNERSMOOTHINGCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer9->Add( m_cornerSmoothingCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 	
+	
 	m_ExportableSetupSizer->Add( bSizer9, 0, wxEXPAND, 5 );
 	
 	wxBoxSizer* m_LeftBox;
@@ -165,8 +170,10 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	
 	m_ThermalShapesParamsSizer->Add( m_CopperWidthValue, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 	
+	
 	m_LeftBox->Add( m_ThermalShapesParamsSizer, 0, wxALL|wxEXPAND, 5 );
 	
+	
 	m_ExportableSetupSizer->Add( m_LeftBox, 0, wxEXPAND, 5 );
 	
 	wxBoxSizer* m_MiddleBox;
@@ -201,6 +208,7 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	m_ArcApproximationOpt->SetSelection( 0 );
 	m_MiddleBox->Add( m_ArcApproximationOpt, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 	
+	
 	m_ExportableSetupSizer->Add( m_MiddleBox, 0, wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizer81;
@@ -226,8 +234,10 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	m_OutlineAppearanceCtrl->SetSelection( 0 );
 	bSizer81->Add( m_OutlineAppearanceCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 	
+	
 	m_ExportableSetupSizer->Add( bSizer81, 0, wxEXPAND, 5 );
 	
+	
 	m_MainBoxSizer->Add( m_ExportableSetupSizer, 1, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizer10;
@@ -245,8 +255,10 @@ DIALOG_COPPER_ZONE_BASE::DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID i
 	m_ButtonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer10->Add( m_ButtonCancel, 0, wxALL|wxEXPAND, 5 );
 	
+	
 	m_MainBoxSizer->Add( bSizer10, 0, wxALIGN_RIGHT|wxALL, 5 );
 	
+	
 	this->SetSizer( m_MainBoxSizer );
 	this->Layout();
 }

pcbnew/dialogs/dialog_copper_zones_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
+// C++ code generated with wxFormBuilder (version Apr 11 2012)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -11,6 +11,7 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
+#include "dialog_shim.h"
 #include <wx/string.h>
 #include <wx/stattext.h>
 #include <wx/gdicmn.h>
@@ -31,7 +32,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DIALOG_COPPER_ZONE_BASE
 ///////////////////////////////////////////////////////////////////////////////
-class DIALOG_COPPER_ZONE_BASE : public wxDialog 
+class DIALOG_COPPER_ZONE_BASE : public DIALOG_SHIM
 {
 	DECLARE_EVENT_TABLE()
 	private:
@@ -66,7 +67,7 @@ class DIALOG_COPPER_ZONE_BASE : public wxDialog
 			ID_M_ARCAPPROXIMATIONOPT,
 			ID_M_ORIENTEDGESOPT,
 			ID_M_OUTLINEAPPEARANCECTRL,
-			wxID_BUTTON_EXPORT,
+			wxID_BUTTON_EXPORT
 		};
 		
 		wxBoxSizer* m_MainBoxSizer;

pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Apr 11 2012)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -9,12 +9,12 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-BEGIN_EVENT_TABLE( DialogNonCopperZonesPropertiesBase, wxDialog )
+BEGIN_EVENT_TABLE( DialogNonCopperZonesPropertiesBase, DIALOG_SHIM )
 	EVT_BUTTON( wxID_OK, DialogNonCopperZonesPropertiesBase::_wxFB_OnOkClick )
 	EVT_BUTTON( wxID_CANCEL, DialogNonCopperZonesPropertiesBase::_wxFB_OnCancelClick )
 END_EVENT_TABLE()
 
-DialogNonCopperZonesPropertiesBase::DialogNonCopperZonesPropertiesBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+DialogNonCopperZonesPropertiesBase::DialogNonCopperZonesPropertiesBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
@@ -40,6 +40,7 @@ DialogNonCopperZonesPropertiesBase::DialogNonCopperZonesPropertiesBase( wxWindow
 	m_ZoneMinThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	sbLeftSizer_->Add( m_ZoneMinThicknessCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
+	
 	m_UpperSizer->Add( sbLeftSizer_, 0, 0, 5 );
 	
 	wxStaticBoxSizer* m_OutilinesBoxOpt;
@@ -57,6 +58,7 @@ DialogNonCopperZonesPropertiesBase::DialogNonCopperZonesPropertiesBase( wxWindow
 	m_OutlineAppearanceCtrl->SetSelection( 1 );
 	m_OutilinesBoxOpt->Add( m_OutlineAppearanceCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
+	
 	m_UpperSizer->Add( m_OutilinesBoxOpt, 0, 0, 5 );
 	
 	wxBoxSizer* m_ButtonsSizer;
@@ -69,8 +71,10 @@ DialogNonCopperZonesPropertiesBase::DialogNonCopperZonesPropertiesBase( wxWindow
 	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_ButtonsSizer->Add( m_buttonCancel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
+	
 	m_UpperSizer->Add( m_ButtonsSizer, 1, wxALIGN_CENTER_VERTICAL, 5 );
 	
+	
 	m_MainSizer->Add( m_UpperSizer, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	m_staticTextLayerSelection = new wxStaticText( this, wxID_ANY, _("Layer selection:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -80,6 +84,7 @@ DialogNonCopperZonesPropertiesBase::DialogNonCopperZonesPropertiesBase( wxWindow
 	m_LayerSelectionCtrl = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
 	m_MainSizer->Add( m_LayerSelectionCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
+	
 	this->SetSizer( m_MainSizer );
 	this->Layout();
 	

pcbnew/dialogs/dialog_non_copper_zones_properties_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Apr 11 2012)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __dialog_non_copper_zones_properties_base__
-#define __dialog_non_copper_zones_properties_base__
+#ifndef __DIALOG_NON_COPPER_ZONES_PROPERTIES_BASE_H__
+#define __DIALOG_NON_COPPER_ZONES_PROPERTIES_BASE_H__
 
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-
+#include "dialog_shim.h"
 #include <wx/string.h>
 #include <wx/radiobox.h>
 #include <wx/gdicmn.h>
@@ -29,7 +31,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DialogNonCopperZonesPropertiesBase
 ///////////////////////////////////////////////////////////////////////////////
-class DialogNonCopperZonesPropertiesBase : public wxDialog 
+class DialogNonCopperZonesPropertiesBase : public DIALOG_SHIM
 {
 	DECLARE_EVENT_TABLE()
 	private:
@@ -51,14 +53,15 @@ class DialogNonCopperZonesPropertiesBase : public wxDialog
 		wxListBox* m_LayerSelectionCtrl;
 		
 		// Virtual event handlers, overide them in your derived class
-		virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
+		
 		DialogNonCopperZonesPropertiesBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Non Copper Zones Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 416,287 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER ); 
 		~DialogNonCopperZonesPropertiesBase();
 	
 };
 
-#endif //__dialog_non_copper_zones_properties_base__
+#endif //__DIALOG_NON_COPPER_ZONES_PROPERTIES_BASE_H__

pcbnew/eagle_plugin.h

@@ -57,6 +57,7 @@ struct ENET
 };
 
 typedef std::map< std::string, ENET >           NET_MAP;
+typedef NET_MAP::const_iterator                 NET_MAP_CITER;
 
 /*
 #include
@@ -81,7 +82,10 @@ struct EATTR;
 struct ECIRCLE;
 struct ETEXT;
 struct ERECT;
-
+struct EPAD;
+struct ESMD;
+struct EVERTEX;
+struct EPOLYGON;
 
 /**
  * Class EAGLE_PLUGIN
@@ -190,6 +194,8 @@ private:
 
     void loadElements( CPTREE& aElements, const std::string& aXpath );
 
+    // none of the 'e'funcs do any "to KiCad" conversion, they merely read the XML into binary:
+
     /**
      * Function ewire
      * converts a <wire>'s xml attributes to binary without additional conversion.
@@ -204,6 +210,10 @@ private:
     ERECT       erect( CPTREE& aRect ) const;
 
     EROT        erot( const std::string& aRot ) const;
+    EPAD        epad( CPTREE& aPad ) const;
+    ESMD        esmd( CPTREE& aSMD ) const;
+    EVERTEX     evertex( CPTREE& aVertex ) const;
+    EPOLYGON    epolygon( CPTREE& aPolygon ) const;
 
     /**
      * Function eattr

pcbnew/specctra_export.cpp

@@ -1152,7 +1152,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR )
             PATH*           mainPolygon = new PATH( plane, T_polygon );
             plane->SetShape( mainPolygon );
 
-            plane->name = TO_UTF8( item->m_Netname );
+            plane->name = TO_UTF8( item->GetNetName() );
 
             if( plane->name.size() == 0 )
             {

pcbnew/zones_by_polygon.cpp

@@ -800,7 +800,7 @@ void PCB_EDIT_FRAME::Edit_Zone_Params( wxDC* DC, ZONE_CONTAINER* aZone )
     NETINFO_ITEM* net = GetBoard()->FindNet( zoneInfo.m_NetcodeSelection );
 
     if( net )   // net == NULL should not occur
-        aZone->m_Netname = net->GetNetname();
+        aZone->SetNetName( net->GetNetname() );
 
     // Combine zones if possible
     GetBoard()->AreaPolygonModified( &_AuxiliaryList, aZone, true, s_Verbose );

pcbnew/zones_non_copper_type_functions.cpp

@@ -74,7 +74,6 @@ DIALOG_NON_COPPER_ZONES_EDITOR::DIALOG_NON_COPPER_ZONES_EDITOR( PCB_BASE_FRAME*
 
 void DIALOG_NON_COPPER_ZONES_EDITOR::Init()
 {
-    SetFocus();
     SetReturnCode( ZONE_ABORT );  // Will be changed on button click
 
     m_FillModeCtrl->SetSelection( m_settings.m_FillMode ? 1 : 0 );

pcbnew/zones_test_and_combine_areas.cpp

@@ -282,7 +282,7 @@ int BOARD::ClipAreaPolygon( PICKED_ITEMS_LIST * aNewZonesList,
         {
             wxString str;
             str.Printf( wxT( "Area %08lX of net \"%s\" has arcs intersecting other sides.\n" ),
-                        aCurrArea->GetTimeStamp(), GetChars( aCurrArea->m_Netname ) );
+                        aCurrArea->GetTimeStamp(), GetChars( aCurrArea->GetNetName() ) );
             str += wxT( "This may cause problems with other editing operations,\n" );
             str += wxT( "such as adding cutouts. It can't be fixed automatically.\n" );
             str += wxT( "Manual correction is recommended." );
@@ -305,7 +305,7 @@ int BOARD::ClipAreaPolygon( PICKED_ITEMS_LIST * aNewZonesList,
         {
             wxString str;
             str.Printf( wxT( "Area %08lX of net \"%s\" is self-intersecting and will be clipped.\n" ),
-                        aCurrArea->GetTimeStamp(), GetChars( aCurrArea->m_Netname ) );
+                        aCurrArea->GetTimeStamp(), GetChars( aCurrArea->GetNetName() ) );
             str += wxT( "This may result in splitting the area.\n" );
             str += wxT( "If the area is complex, this may take a few seconds." );
             wxMessageBox( str );
@@ -482,7 +482,7 @@ int BOARD::CombineAllAreasInNet( PICKED_ITEMS_LIST* aDeletedList, int aNetCode,
                                 str.Printf( wxT( "Areas %d and %d of net \"%s\" intersect, but some of the intersecting sides are arcs.\n" ),
                                             ia1 + 1,
                                             ia2 + 1,
-                                            GetChars( curr_area->m_Netname ) );
+                                            GetChars( curr_area->GetNetName() ) );
                                 str += wxT( "Therefore, these areas can't be combined." );
                                 wxMessageBox( str );
                             }