added an option to enable/disable magnetic tracks in the general options dialog of PCBnew (same as the magnetic

pads option.)  Haven't fixed the via issue 
(since I don't quite understand why it is doing this, nor does it occur in 100% of the cases), but now you can just 
turn 
off magnetic tracks when I desire to move vias by small increments.  Magnetic tracks are on by default.  Original 
via complaint here: 
http://tech.groups.yahoo.com/group/kicad-devel/message/1155

Also mostly gotten rid of the annoying "Unable to drag this segment: two collinear segments" error.  Now, if two 
(or more) segments are collinear, they are merged into one equivalent segment when you try to drag them while 
maintaining slope.  I can't imagine any cases where this would be a bad thing (and I have plenty of experience where 
the error was not desired!).  Note I say *mostly* because there still seem to be some length=1 (e.g. 0.003mm) segments 
at the end of valid-length segments.  I do not want to remove them because this would change the board layout, though 
in a basically imperceptible way.  We could maybe have an option to clean & remove these minimal-length segments, but 
I worry that they serve to connect things slightly off grid & those things on-grid; also, removal may cause DRC 
errors. It would be good if we could avoid their creation.(?)

include/wxPcbStruct.h

@@ -489,6 +489,7 @@ public:
     void                Attribut_net( wxDC* DC, int net_code, bool Flag_On );
     void                Start_MoveOneNodeOrSegment( TRACK* track, wxDC* DC, int command );
     bool                PlaceDraggedTrackSegment( TRACK* Track, wxDC* DC );
+	bool				MergeCollinearTracks( TRACK* track, wxDC* DC, int end ); 
     void                Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC );
     void                SwitchLayer( wxDC* DC, int layer );
     int                 Add_45_degrees_Segment( wxDC* DC, TRACK* pt_segm );

pcbnew/controle.cpp

@@ -307,23 +307,29 @@ static bool Magnetize( BOARD* m_Pcb, WinEDA_PcbFrame* frame,
         curr = NULL;
     }
 
-    switch( g_MagneticPadOption )
+	bool pad_ok = false; 
-    {
+	if( g_MagneticPadOption == capture_always )
-    case capture_cursor_in_track_tool:
+		pad_ok = true; 
-        if( aCurrentTool != ID_TRACK_BUTT )
+	
-            return false;
+	
-        break;
+	bool track_ok = false; 
-
+	if( g_MagneticTrackOption == capture_always )
-    case capture_always:
+		track_ok = true; 
-        break;
+	
-
+	if( aCurrentTool == ID_TRACK_BUTT )
-    case no_effect:
+	{
-    default:
+		int q = capture_cursor_in_track_tool; 
-        return false;
+		if( g_MagneticPadOption == q )
-    }
+			pad_ok = true; 
+		if( g_MagneticTrackOption == q )
+			track_ok = true; 
+	}
+	
+    if(!pad_ok && !track_ok) //then nothing magnetic to do
+		return false; 
 
     pad = Locate_Any_Pad( m_Pcb, CURSEUR_OFF_GRILLE, TRUE );
-    if( pad )
+    if( pad && pad_ok)
     {
         if( doCheckNet && curr && curr->GetNet() != pad->GetNet() )
             return false;
@@ -335,7 +341,7 @@ static bool Magnetize( BOARD* m_Pcb, WinEDA_PcbFrame* frame,
     layer = ( (PCB_SCREEN*) ActiveScreen )->m_Active_Layer;
 
     via = Locate_Via_Area( m_Pcb, *curpos, layer );
-    if( via )
+    if( via && track_ok) //vias are part of tracks...?
     {
         if( doCheckNet && curr && curr->GetNet() != via->GetNet() )
             return false;
@@ -346,7 +352,7 @@ static bool Magnetize( BOARD* m_Pcb, WinEDA_PcbFrame* frame,
 
     layer_mask = g_TabOneLayerMask[layer];
 
-    if( !curr )
+    if( !curr && track_ok)
     {
         track = Locate_Pistes( m_Pcb->m_Track, layer_mask, CURSEUR_OFF_GRILLE );
         if( !track || track->Type() != TYPETRACK )
@@ -359,7 +365,7 @@ static bool Magnetize( BOARD* m_Pcb, WinEDA_PcbFrame* frame,
      * In two segment mode, ignore the final segment if it's inside a grid
      * square.
      */
-    if( g_TwoSegmentTrackBuild && curr->Back()
+    if( curr && g_TwoSegmentTrackBuild && curr->Back()
         && curr->m_Start.x - grid.x < curr->m_End.x
         && curr->m_Start.x + grid.x > curr->m_End.x
         && curr->m_Start.y - grid.y < curr->m_End.y
@@ -368,7 +374,7 @@ static bool Magnetize( BOARD* m_Pcb, WinEDA_PcbFrame* frame,
         curr = curr->Back();
     }
 
-    for( track = m_Pcb->m_Track;  track;  track = track->Next() )
+    for( track = m_Pcb->m_Track;  track && track_ok;  track = track->Next() )
     {
         if( track->Type() != TYPETRACK )
             continue;

pcbnew/dialog_general_options.cpp

@@ -227,15 +227,18 @@ bool WinEDA_PcbGeneralOptionsFrame::Create( wxWindow* parent, wxWindowID id, con
     m_AutoPANOpt = NULL;
     m_Track_DoubleSegm_Ctrl = NULL;
     m_MagneticPadOptCtrl = NULL;
+    m_MagneticTrackOptCtrl = NULL;
 ////@end WinEDA_PcbGeneralOptionsFrame member initialisation
 
 ////@begin WinEDA_PcbGeneralOptionsFrame creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
+    SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
     CreateControls();
-    GetSizer()->Fit(this);
+    if (GetSizer())
-    GetSizer()->SetSizeHints(this);
+    {
+        GetSizer()->SetSizeHints(this);
+    }
     Centre();
 ////@end WinEDA_PcbGeneralOptionsFrame creation
     SetFont(*g_DialogFont);
@@ -249,7 +252,7 @@ bool WinEDA_PcbGeneralOptionsFrame::Create( wxWindow* parent, wxWindowID id, con
 void WinEDA_PcbGeneralOptionsFrame::CreateControls()
 {    
 ////@begin WinEDA_PcbGeneralOptionsFrame content construction
-    // Generated by DialogBlocks, 13/04/2006 22:32:02 (unregistered)
+    // Generated by DialogBlocks, Mon 03 Mar 2008 04:27:22 PM EST (unregistered)
 
     WinEDA_PcbGeneralOptionsFrame* itemDialog1 = this;
 
@@ -259,30 +262,25 @@ void WinEDA_PcbGeneralOptionsFrame::CreateControls()
     wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
     itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxALL, 5);
 
-    static const wxString m_PolarDisplayStrings[] = {
+    wxArrayString m_PolarDisplayStrings;
-        _("No Display"),
+    m_PolarDisplayStrings.Add(_("No Display"));
-        _("Display")
+    m_PolarDisplayStrings.Add(_("Display"));
-    };
+    m_PolarDisplay = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Display Polar Coord"), wxDefaultPosition, wxDefaultSize, m_PolarDisplayStrings, 1, wxRA_SPECIFY_COLS );
-    
+    m_PolarDisplay->SetSelection(0);
-    m_PolarDisplay = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Display Polar Coord"), wxDefaultPosition, wxDefaultSize, 2, m_PolarDisplayStrings, 1, wxRA_SPECIFY_COLS );
     itemBoxSizer3->Add(m_PolarDisplay, 0, wxALIGN_LEFT|wxALL, 5);
 
-    static const wxString m_BoxUnitsStrings[] = {
+    wxArrayString m_BoxUnitsStrings;
-        _("Inches"),
+    m_BoxUnitsStrings.Add(_("Inches"));
-        _("millimeters")
+    m_BoxUnitsStrings.Add(_("millimeters"));
-    };
+    m_BoxUnits = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Units"), wxDefaultPosition, wxDefaultSize, m_BoxUnitsStrings, 1, wxRA_SPECIFY_COLS );
-    
+    m_BoxUnits->SetSelection(0);
-    m_BoxUnits = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Units"), wxDefaultPosition, 
-                                    wxDefaultSize, 2, m_BoxUnitsStrings, 1,wxRA_SPECIFY_COLS );
     itemBoxSizer3->Add(m_BoxUnits, 0, wxALIGN_LEFT|wxALL, 5);
 
-    static const wxString m_CursorShapeStrings[] = {
+    wxArrayString m_CursorShapeStrings;
-        _("Small"),
+    m_CursorShapeStrings.Add(_("Small"));
-        _("Big")
+    m_CursorShapeStrings.Add(_("Big"));
-    };
+    m_CursorShape = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("Cursor"), wxDefaultPosition, wxDefaultSize, m_CursorShapeStrings, 1, wxRA_SPECIFY_COLS );
-    
+    m_CursorShape->SetSelection(0);
-    m_CursorShape = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("Cursor"), wxDefaultPosition, wxDefaultSize, 2,
-                        m_CursorShapeStrings, 1, wxRA_SPECIFY_COLS );
     itemBoxSizer3->Add(m_CursorShape, 0, wxALIGN_LEFT|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer7 = new wxBoxSizer(wxVERTICAL);
@@ -292,14 +290,14 @@ void WinEDA_PcbGeneralOptionsFrame::CreateControls()
     wxStaticBoxSizer* itemStaticBoxSizer8 = new wxStaticBoxSizer(itemStaticBoxSizer8Static, wxVERTICAL);
     itemBoxSizer7->Add(itemStaticBoxSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
-    m_LayerNumber = new wxSpinCtrl( itemDialog1, ID_SPINCTRL1, _T("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 16, 0 );
+    m_LayerNumber = new wxSpinCtrl( itemDialog1, ID_SPINCTRL1, _T("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 16, 1 );
     itemStaticBoxSizer8->Add(m_LayerNumber, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
     wxStaticBox* itemStaticBoxSizer10Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Max Links:"));
     wxStaticBoxSizer* itemStaticBoxSizer10 = new wxStaticBoxSizer(itemStaticBoxSizer10Static, wxVERTICAL);
     itemBoxSizer7->Add(itemStaticBoxSizer10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
-    m_MaxShowLinks = new wxSpinCtrl( itemDialog1, ID_SPINCTRL2, _T("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 5, 0 );
+    m_MaxShowLinks = new wxSpinCtrl( itemDialog1, ID_SPINCTRL2, _T("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 5, 1 );
     itemStaticBoxSizer10->Add(m_MaxShowLinks, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
     wxStaticBox* itemStaticBoxSizer12Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Auto Save (minuts):"));
@@ -351,30 +349,40 @@ void WinEDA_PcbGeneralOptionsFrame::CreateControls()
     m_Track_DoubleSegm_Ctrl->SetForegroundColour(wxColour(0, 144, 0));
     itemStaticBoxSizer15->Add(m_Track_DoubleSegm_Ctrl, 0, wxALIGN_LEFT|wxALL, 5);
 
-    static const wxString m_MagneticPadOptCtrlStrings[] = {
+    wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxVERTICAL);
-        _("Never"),
+    itemBoxSizer2->Add(itemBoxSizer24, 0, wxALIGN_TOP|wxALL, 5);
-        _("When creating tracks"),
+
-        _("Always")
+    wxArrayString m_MagneticPadOptCtrlStrings;
-    };
+    m_MagneticPadOptCtrlStrings.Add(_("Never"));
-    
+    m_MagneticPadOptCtrlStrings.Add(_("When creating tracks"));
-    m_MagneticPadOptCtrl = new wxRadioBox( itemDialog1, ID_MAGNETIC_PAD_CTRL, _("Magnetic Pads"), wxDefaultPosition, wxDefaultSize, 3, m_MagneticPadOptCtrlStrings, 1, wxRA_SPECIFY_COLS );
+    m_MagneticPadOptCtrlStrings.Add(_("Always"));
-    if (ShowToolTips())
+    m_MagneticPadOptCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX4, _("Magnetic Pads"), wxDefaultPosition, wxDefaultSize, m_MagneticPadOptCtrlStrings, 1, wxRA_SPECIFY_COLS );
+    m_MagneticPadOptCtrl->SetSelection(0);
+    if (WinEDA_PcbGeneralOptionsFrame::ShowToolTips())
         m_MagneticPadOptCtrl->SetToolTip(_("control the capture of the pcb cursor when the mouse cursor enters a pad area"));
-    itemStaticBoxSizer15->Add(m_MagneticPadOptCtrl, 0, wxGROW|wxALL, 5);
+    itemBoxSizer24->Add(m_MagneticPadOptCtrl, 0, wxGROW|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxVERTICAL);
+    wxArrayString m_MagneticTrackOptCtrlStrings;
-    itemBoxSizer2->Add(itemBoxSizer25, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    m_MagneticTrackOptCtrlStrings.Add(_("Never"));
+    m_MagneticTrackOptCtrlStrings.Add(_("When creating tracks"));
+    m_MagneticTrackOptCtrlStrings.Add(_("Always"));
+    m_MagneticTrackOptCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX3, _("Magnetic Tracks"), wxDefaultPosition, wxDefaultSize, m_MagneticTrackOptCtrlStrings, 1, wxRA_SPECIFY_COLS );
+    m_MagneticTrackOptCtrl->SetSelection(0);
+    if (WinEDA_PcbGeneralOptionsFrame::ShowToolTips())
+        m_MagneticTrackOptCtrl->SetToolTip(_("control the capture of the pcb cursor when the mouse cursor enters a track"));
+    itemBoxSizer24->Add(m_MagneticTrackOptCtrl, 0, wxGROW|wxALL, 5);
 
-    wxButton* itemButton26 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton* itemButton27 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton26->SetForegroundColour(wxColour(221, 0, 0));
+    itemButton27->SetForegroundColour(wxColour(221, 0, 0));
-    itemBoxSizer25->Add(itemButton26, 0, wxGROW|wxALL, 5);
+    itemBoxSizer24->Add(itemButton27, 0, wxGROW|wxALL, 5);
 
-    wxButton* itemButton27 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton* itemButton28 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton27->SetForegroundColour(wxColour(0, 0, 255));
+    itemButton28->SetForegroundColour(wxColour(0, 0, 255));
-    itemBoxSizer25->Add(itemButton27, 0, wxGROW|wxALL, 5);
+    itemBoxSizer24->Add(itemButton28, 0, wxGROW|wxALL, 5);
 
     // Set validators
     m_MagneticPadOptCtrl->SetValidator( wxGenericValidator(& g_MagneticPadOption) );
+    m_MagneticTrackOptCtrl->SetValidator( wxGenericValidator(& g_MagneticTrackOption) );
 ////@end WinEDA_PcbGeneralOptionsFrame content construction
 }
 

pcbnew/dialog_general_options.h

@@ -40,11 +40,6 @@ class wxSpinCtrl;
  */
 
 ////@begin control identifiers
-#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
-#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_TITLE _("General Options")
-#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_IDNAME wxID_CANCEL
-#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_POSITION wxDefaultPosition
 #define ID_RADIOBOX 10001
 #define ID_RADIOBOX1 10002
 #define ID_RADIOBOX2 10003
@@ -59,7 +54,13 @@ class wxSpinCtrl;
 #define ID_CHECKBOX5 10012
 #define ID_CHECKBOX6 10013
 #define ID_CHECKBOX7 10014
-#define ID_MAGNETIC_PAD_CTRL 10000
+#define ID_RADIOBOX4 10016
+#define ID_RADIOBOX3 10015
+#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
+#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_TITLE _("General Options")
+#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_IDNAME wxID_CANCEL
+#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_SIZE wxSize(400, 300)
+#define SYMBOL_WINEDA_PCBGENERALOPTIONSFRAME_POSITION wxDefaultPosition
 ////@end control identifiers
 
 /*!
@@ -131,6 +132,7 @@ public:
     wxCheckBox* m_AutoPANOpt;
     wxCheckBox* m_Track_DoubleSegm_Ctrl;
     wxRadioBox* m_MagneticPadOptCtrl;
+    wxRadioBox* m_MagneticTrackOptCtrl;
 ////@end WinEDA_PcbGeneralOptionsFrame member variables
 	WinEDA_PcbFrame * m_Parent;
 	wxDC * m_DC;

pcbnew/dialog_general_options.pjd

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1252"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <anthemion-project version="1.0.0.0" xmlns="http://www.anthemion.co.uk">
   <header>
     <long name="name_counter">0</long>
@@ -6,18 +6,20 @@
     <string name="title">""</string>
     <string name="author">""</string>
     <string name="description">""</string>
-    <long name="doc_count">35</long>
     <string name="xrc_filename">""</string>
     <bool name="convert_images_to_xpm">0</bool>
     <bool name="inline_images">0</bool>
     <bool name="generate_cpp_for_xrc">0</bool>
+    <long name="working_mode">1</long>
     <bool name="use_help_text_for_tooltips">1</bool>
     <bool name="translate_strings">1</bool>
+    <bool name="make_unicode_strings">1</bool>
     <bool name="extract_strings">0</bool>
     <string name="user_name">"jean-pierre Charras"</string>
     <string name="copyright_string">"License GNU"</string>
     <string name="resource_prefix">""</string>
     <bool name="use_two_step_construction">0</bool>
+    <bool name="use_enums">0</bool>
     <string name="current_platform">"&lt;All platforms&gt;"</string>
     <string name="target_wx_version">"&lt;Any&gt;"</string>
     <string name="cpp_header_comment">"/////////////////////////////////////////////////////////////////////////////
@@ -43,12 +45,6 @@
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
 
-"</string>
-    <string name="cpp_function_comment">"
-/*!
- * %BODY%
- */
-
 "</string>
     <string name="cpp_symbols_file_comment">"/////////////////////////////////////////////////////////////////////////////
 // Name:        %SYMBOLS-FILENAME%
@@ -82,6 +78,14 @@
 #include &quot;wx/wx.h&quot;
 #endif
 
+"</string>
+    <string name="cpp_function_declaration_comment">"	/// %BODY%
+"</string>
+    <string name="cpp_function_implementation_comment">"
+/*!
+ * %BODY%
+ */
+
 "</string>
     <string name="resource_file_header">"app_resources.h"</string>
     <string name="resource_file_implementation">"app_resources.cpp"</string>
@@ -93,11 +97,23 @@
     <string name="external_symbol_filenames">""</string>
     <string name="configuration">"&lt;None&gt;"</string>
     <string name="source_encoding">"&lt;System&gt;"</string>
+    <string name="xrc_encoding">"utf-8"</string>
     <string name="project_encoding">"&lt;System&gt;"</string>
     <string name="resource_archive">""</string>
+    <long name="text_file_type">0</long>
+    <bool name="use_tabs">0</bool>
+    <long name="indent_size">4</long>
+    <string name="whitespace_after_return_type">" "</string>
+    <string name="resource_xrc_cpp">""</string>
     <bool name="use_resource_archive">0</bool>
+    <bool name="use_generated_xrc_cpp">0</bool>
+    <bool name="always_generate_xrc">1</bool>
+    <bool name="use_id_name_for_name">0</bool>
     <bool name="archive_xrc_files">1</bool>
     <bool name="archive_image_files">1</bool>
+    <bool name="archive_all_image_files">0</bool>
+    <bool name="xrc_retain_relative_paths">1</bool>
+    <bool name="xrc_generate_id_tags">0</bool>
   </header>
   <data>
     <document>
@@ -120,6 +136,7 @@
         <long name="locked">0</long>
         <string name="template-name">""</string>
         <bool name="dirty">1</bool>
+        <long name="makefile-last-written">0</long>
         <string name="Compiler name">""</string>
         <string name="Build mode">"Debug"</string>
         <string name="Unicode mode">"ANSI"</string>
@@ -161,6 +178,8 @@
         <string name="wxWidgets build command">"%AUTO%"</string>
         <string name="wxWidgets clean command">"%AUTO%"</string>
         <string name="PATH variable">"%AUTO%"</string>
+        <bool name="Suppress source rules">0</bool>
+        <bool name="Enable makefile generation">1</bool>
         <document>
           <string name="title">"GCC Release"</string>
           <string name="type">"gcc-config-data-document"</string>
@@ -172,6 +191,7 @@
           <long name="locked">0</long>
           <string name="template-name">"GCC"</string>
           <bool name="dirty">1</bool>
+          <long name="makefile-last-written">0</long>
           <string name="Compiler name">"GCC"</string>
           <string name="Build mode">"Release"</string>
           <string name="Unicode mode">"ANSI"</string>
@@ -185,6 +205,7 @@
           <string name="Use OpenGL">"No"</string>
           <string name="Use wx-config">"Yes"</string>
           <string name="Use installed wxWidgets">"No"</string>
+          <string name="Enable universal binaries">"No"</string>
           <string name="wxWidgets version">"%WXVERSION%"</string>
           <string name="Executable name">"%EXECUTABLE%"</string>
           <string name="Program arguments">""</string>
@@ -215,7 +236,13 @@
           <string name="wxWidgets build command">"%AUTO%"</string>
           <string name="wxWidgets clean command">"%AUTO%"</string>
           <string name="PATH variable">"%AUTO%"</string>
+          <bool name="Suppress source rules">0</bool>
+          <bool name="Enable makefile generation">1</bool>
           <string name="Command for wx-config">"%AUTO%"</string>
+          <string name="SDK path">"%AUTO%"</string>
+          <string name="Minimum OS version">"%AUTO%"</string>
+          <string name="Info.plist location">"%AUTO%"</string>
+          <string name="Icns location">"%AUTO%"</string>
         </document>
       </document>
     </document>
@@ -230,7 +257,7 @@
       <long name="is-transient">1</long>
       <long name="owns-file">1</long>
       <long name="title-mode">0</long>
-      <long name="locked">0</long>
+      <long name="locked">1</long>
       <document>
         <string name="title">"Windows"</string>
         <string name="type">"html-document"</string>
@@ -254,7 +281,10 @@
           <long name="base-id">10000</long>
           <bool name="use-id-prefix">0</bool>
           <string name="id-prefix">""</string>
+          <bool name="use-id-suffix">0</bool>
+          <string name="id-suffix">""</string>
           <long name="use-xrc">0</long>
+          <long name="working-mode">0</long>
           <string name="proxy-Id name">"wxID_CANCEL"</string>
           <long name="proxy-Id value">5101</long>
           <string name="proxy-Class">"WinEDA_PcbGeneralOptionsFrame"</string>
@@ -275,10 +305,16 @@
           <bool name="proxy-Hidden">0</bool>
           <bool name="proxy-Enabled">1</bool>
           <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+          <string name="proxy-Data source">""</string>
+          <string name="proxy-Data class name">""</string>
+          <string name="proxy-Data class implementation filename">""</string>
+          <string name="proxy-Data class header filename">""</string>
+          <string name="proxy-Data class manager window">""</string>
+          <string name="proxy-Texture">""</string>
+          <string name="proxy-Texture style">"Tiled"</string>
           <bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
           <bool name="proxy-wxCAPTION">1</bool>
           <bool name="proxy-wxRESIZE_BORDER">0</bool>
-          <bool name="proxy-wxTHICK_FRAME">0</bool>
           <bool name="proxy-wxSYSTEM_MENU">1</bool>
           <bool name="proxy-wxSTAY_ON_TOP">0</bool>
           <bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
@@ -293,7 +329,9 @@
           <bool name="proxy-wxRAISED_BORDER">0</bool>
           <bool name="proxy-wxSTATIC_BORDER">0</bool>
           <bool name="proxy-wxWANTS_CHARS">0</bool>
-          <bool name="proxy-wxCLIP_CHILDREN ">0</bool>
+          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+          <bool name="proxy-wxCLIP_CHILDREN">0</bool>
           <bool name="proxy-wxTAB_TRAVERSAL">0</bool>
           <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
           <bool name="proxy-wxWS_EX_BLOCK_EVENTS">1</bool>
@@ -305,6 +343,7 @@
           <long name="proxy-Y">-1</long>
           <long name="proxy-Width">400</long>
           <long name="proxy-Height">300</long>
+          <bool name="proxy-AUI manager">0</bool>
           <string name="proxy-Event sources">""</string>
           <document>
             <string name="title">"wxBoxSizer H"</string>
@@ -360,10 +399,18 @@
                 <string name="proxy-type">"wbRadioBoxProxy"</string>
                 <string name="proxy-Id name">"ID_RADIOBOX"</string>
                 <long name="proxy-Id value">10001</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxRadioBox"</string>
+                <string name="proxy-Base class">"wxRadioBox"</string>
+                <bool name="proxy-External implementation">1</bool>
+                <bool name="proxy-Separate files">0</bool>
+                <string name="proxy-Implementation filename">""</string>
+                <string name="proxy-Header filename">""</string>
                 <string name="proxy-Member variable name">"m_PolarDisplay"</string>
                 <string name="proxy-Label">"Display Polar Coord"</string>
                 <long name="proxy-Major dimension count">1</long>
+                <string name="proxy-Items">"No Display|Display"</string>
+                <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
                 <string name="proxy-Background colour">""</string>
@@ -374,10 +421,16 @@
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <string name="proxy-Data variable">""</string>
                 <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                 <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
-                <string name="proxy-Items">"No Display|Display"</string>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
+                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                 <string name="proxy-Custom styles">""</string>
                 <long name="proxy-X">-1</long>
                 <long name="proxy-Y">-1</long>
@@ -410,10 +463,18 @@
                 <string name="proxy-type">"wbRadioBoxProxy"</string>
                 <string name="proxy-Id name">"ID_RADIOBOX1"</string>
                 <long name="proxy-Id value">10002</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxRadioBox"</string>
+                <string name="proxy-Base class">"wxRadioBox"</string>
+                <bool name="proxy-External implementation">1</bool>
+                <bool name="proxy-Separate files">0</bool>
+                <string name="proxy-Implementation filename">""</string>
+                <string name="proxy-Header filename">""</string>
                 <string name="proxy-Member variable name">"m_BoxUnits"</string>
                 <string name="proxy-Label">"Units"</string>
                 <long name="proxy-Major dimension count">1</long>
+                <string name="proxy-Items">"Inches|millimeters"</string>
+                <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
                 <string name="proxy-Background colour">""</string>
@@ -424,10 +485,16 @@
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <string name="proxy-Data variable">""</string>
                 <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                 <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
-                <string name="proxy-Items">"Inches|millimeters"</string>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
+                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                 <string name="proxy-Custom styles">""</string>
                 <long name="proxy-X">-1</long>
                 <long name="proxy-Y">-1</long>
@@ -460,10 +527,18 @@
                 <string name="proxy-type">"wbRadioBoxProxy"</string>
                 <string name="proxy-Id name">"ID_RADIOBOX2"</string>
                 <long name="proxy-Id value">10003</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxRadioBox"</string>
+                <string name="proxy-Base class">"wxRadioBox"</string>
+                <bool name="proxy-External implementation">1</bool>
+                <bool name="proxy-Separate files">0</bool>
+                <string name="proxy-Implementation filename">""</string>
+                <string name="proxy-Header filename">""</string>
                 <string name="proxy-Member variable name">"m_CursorShape"</string>
                 <string name="proxy-Label">"Cursor"</string>
                 <long name="proxy-Major dimension count">1</long>
+                <string name="proxy-Items">"Small|Big"</string>
+                <long name="proxy-Initial value">0</long>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
                 <string name="proxy-Background colour">""</string>
@@ -474,10 +549,16 @@
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <string name="proxy-Data variable">""</string>
                 <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                 <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
-                <string name="proxy-Items">"Small|Big"</string>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
+                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                 <string name="proxy-Custom styles">""</string>
                 <long name="proxy-X">-1</long>
                 <long name="proxy-Y">-1</long>
@@ -537,13 +618,14 @@
                 <string name="proxy-Id name">"wxID_ANY"</string>
                 <long name="proxy-Id value">-1</long>
                 <string name="proxy-Label">"Number of Layers:"</string>
+                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-Sizer member variable name">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Static box class">"wxStaticBox"</string>
                 <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-AlignH">"Centre"</string>
                 <string name="proxy-AlignV">"Centre"</string>
                 <long name="proxy-Stretch factor">0</long>
@@ -569,7 +651,13 @@
                   <string name="proxy-type">"wbSpinCtrlProxy"</string>
                   <string name="proxy-Id name">"ID_SPINCTRL1"</string>
                   <long name="proxy-Id value">10005</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxSpinCtrl"</string>
+                  <string name="proxy-Base class">"wxSpinCtrl"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_LayerNumber"</string>
                   <long name="proxy-Minimum value">1</long>
                   <long name="proxy-Maximum value">16</long>
@@ -584,6 +672,11 @@
                   <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <bool name="proxy-wxSP_ARROW_KEYS">1</bool>
                   <bool name="proxy-wxSP_WRAP">0</bool>
                   <bool name="proxy-wxNO_BORDER">0</bool>
@@ -593,6 +686,8 @@
                   <bool name="proxy-wxRAISED_BORDER">0</bool>
                   <bool name="proxy-wxSTATIC_BORDER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -627,13 +722,14 @@
                 <string name="proxy-Id name">"wxID_ANY"</string>
                 <long name="proxy-Id value">-1</long>
                 <string name="proxy-Label">"Max Links:"</string>
+                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-Sizer member variable name">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Static box class">"wxStaticBox"</string>
                 <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-AlignH">"Centre"</string>
                 <string name="proxy-AlignV">"Centre"</string>
                 <long name="proxy-Stretch factor">0</long>
@@ -659,7 +755,13 @@
                   <string name="proxy-type">"wbSpinCtrlProxy"</string>
                   <string name="proxy-Id name">"ID_SPINCTRL2"</string>
                   <long name="proxy-Id value">10006</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxSpinCtrl"</string>
+                  <string name="proxy-Base class">"wxSpinCtrl"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_MaxShowLinks"</string>
                   <long name="proxy-Minimum value">1</long>
                   <long name="proxy-Maximum value">5</long>
@@ -674,6 +776,11 @@
                   <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <bool name="proxy-wxSP_ARROW_KEYS">1</bool>
                   <bool name="proxy-wxSP_WRAP">0</bool>
                   <bool name="proxy-wxNO_BORDER">0</bool>
@@ -683,6 +790,8 @@
                   <bool name="proxy-wxRAISED_BORDER">0</bool>
                   <bool name="proxy-wxSTATIC_BORDER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -717,13 +826,14 @@
                 <string name="proxy-Id name">"wxID_ANY"</string>
                 <long name="proxy-Id value">-1</long>
                 <string name="proxy-Label">"Auto Save (minuts):"</string>
+                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-Sizer member variable name">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Static box class">"wxStaticBox"</string>
                 <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-AlignH">"Centre"</string>
                 <string name="proxy-AlignV">"Centre"</string>
                 <long name="proxy-Stretch factor">0</long>
@@ -749,7 +859,13 @@
                   <string name="proxy-type">"wbSpinCtrlProxy"</string>
                   <string name="proxy-Id name">"ID_SPINCTRL3"</string>
                   <long name="proxy-Id value">10004</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxSpinCtrl"</string>
+                  <string name="proxy-Base class">"wxSpinCtrl"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_SaveTime"</string>
                   <long name="proxy-Minimum value">0</long>
                   <long name="proxy-Maximum value">60</long>
@@ -764,6 +880,11 @@
                   <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <bool name="proxy-wxSP_ARROW_KEYS">1</bool>
                   <bool name="proxy-wxSP_WRAP">0</bool>
                   <bool name="proxy-wxNO_BORDER">0</bool>
@@ -773,6 +894,8 @@
                   <bool name="proxy-wxRAISED_BORDER">0</bool>
                   <bool name="proxy-wxSTATIC_BORDER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -833,13 +956,14 @@
                 <string name="proxy-Id name">"wxID_ANY"</string>
                 <long name="proxy-Id value">-1</long>
                 <string name="proxy-Label">"Options:"</string>
+                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-Sizer member variable name">""</string>
                 <string name="proxy-Foreground colour">""</string>
                 <string name="proxy-Font">""</string>
                 <bool name="proxy-Hidden">0</bool>
                 <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Static box class">"wxStaticBox"</string>
                 <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-Member variable name">""</string>
                 <string name="proxy-AlignH">"Centre"</string>
                 <string name="proxy-AlignV">"Centre"</string>
                 <long name="proxy-Stretch factor">0</long>
@@ -865,7 +989,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX"</string>
                   <long name="proxy-Id value">10007</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_DrcOn"</string>
                   <string name="proxy-Label">"Drc ON"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -873,6 +1003,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">"C60000"</string>
                   <string name="proxy-Font">""</string>
@@ -884,6 +1019,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -916,7 +1053,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX1"</string>
                   <long name="proxy-Id value">10008</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_ShowGlobalRatsnest"</string>
                   <string name="proxy-Label">"Show Ratsnest"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -924,6 +1067,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -935,6 +1083,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -967,7 +1117,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX2"</string>
                   <long name="proxy-Id value">10009</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_ShowModuleRatsnest"</string>
                   <string name="proxy-Label">"Show Mod Ratsnest"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -975,6 +1131,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -986,6 +1147,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1018,7 +1181,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX3"</string>
                   <long name="proxy-Id value">10010</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_TrackAutodel"</string>
                   <string name="proxy-Label">"Tracks Auto Del"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -1026,6 +1195,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -1037,6 +1211,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1069,7 +1245,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX4"</string>
                   <long name="proxy-Id value">10011</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_Track_45_Only_Ctrl"</string>
                   <string name="proxy-Label">"Track 45 Only"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -1077,6 +1259,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -1088,6 +1275,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1120,7 +1309,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX5"</string>
                   <long name="proxy-Id value">10012</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_Segments_45_Only_Ctrl"</string>
                   <string name="proxy-Label">"Segments 45 Only"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -1128,6 +1323,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -1139,6 +1339,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1171,7 +1373,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX6"</string>
                   <long name="proxy-Id value">10013</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_AutoPANOpt"</string>
                   <string name="proxy-Label">"Auto PAN"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -1179,6 +1387,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">"0000FF"</string>
                   <string name="proxy-Font">""</string>
@@ -1190,6 +1403,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1222,7 +1437,13 @@
                   <string name="proxy-type">"wbCheckBoxProxy"</string>
                   <string name="proxy-Id name">"ID_CHECKBOX7"</string>
                   <long name="proxy-Id value">10014</long>
+                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxCheckBox"</string>
+                  <string name="proxy-Base class">"wxCheckBox"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
                   <string name="proxy-Member variable name">"m_Track_DoubleSegm_Ctrl"</string>
                   <string name="proxy-Label">"Double Segm Track"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -1230,6 +1451,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">""</string>
                   <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">"009000"</string>
                   <string name="proxy-Font">""</string>
@@ -1241,6 +1467,8 @@
                   <bool name="proxy-wxCHK_3STATE">0</bool>
                   <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
                   <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                   <string name="proxy-Custom styles">""</string>
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
@@ -1260,56 +1488,6 @@
                   <string name="proxy-Custom arguments">""</string>
                   <string name="proxy-Custom ctor arguments">""</string>
                 </document>
-                <document>
-                  <string name="title">"wxRadioBox: ID_MAGNETIC_PAD_CTRL"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"radiobox"</string>
-                  <long name="is-transient">0</long>
-                  <long name="owns-file">1</long>
-                  <long name="title-mode">0</long>
-                  <long name="locked">0</long>
-                  <string name="created">"13/6/2006"</string>
-                  <string name="proxy-type">"wbRadioBoxProxy"</string>
-                  <string name="proxy-Id name">"ID_MAGNETIC_PAD_CTRL"</string>
-                  <long name="proxy-Id value">10000</long>
-                  <string name="proxy-Class">"wxRadioBox"</string>
-                  <string name="proxy-Member variable name">"m_MagneticPadOptCtrl"</string>
-                  <string name="proxy-Label">"Magnetic Pads"</string>
-                  <long name="proxy-Major dimension count">1</long>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">"control the capture of the pcb cursor when the mouse cursor enters a pad area"</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">""</string>
-                  <string name="proxy-Font">""</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <string name="proxy-Data variable">"g_MagneticPadOption"</string>
-                  <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
-                  <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
-                  <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
-                  <string name="proxy-Items">"Never|When creating tracks|Always"</string>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Expand"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
               </document>
             </document>
             <document>
@@ -1326,7 +1504,7 @@
               <string name="proxy-Orientation">"Vertical"</string>
               <string name="proxy-Member variable name">""</string>
               <string name="proxy-AlignH">"Centre"</string>
-              <string name="proxy-AlignV">"Centre"</string>
+              <string name="proxy-AlignV">"Top"</string>
               <long name="proxy-Stretch factor">0</long>
               <long name="proxy-Border">5</long>
               <bool name="proxy-wxLEFT">1</bool>
@@ -1337,6 +1515,134 @@
               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
               <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+              <document>
+                <string name="title">"wxRadioBox: ID_RADIOBOX4"</string>
+                <string name="type">"dialog-control-document"</string>
+                <string name="filename">""</string>
+                <string name="icon-name">"radiobox"</string>
+                <long name="is-transient">0</long>
+                <long name="owns-file">1</long>
+                <long name="title-mode">0</long>
+                <long name="locked">0</long>
+                <string name="created">"3/3/2008"</string>
+                <string name="proxy-type">"wbRadioBoxProxy"</string>
+                <string name="proxy-Id name">"ID_RADIOBOX4"</string>
+                <long name="proxy-Id value">10016</long>
+                <string name="proxy-Name">""</string>
+                <string name="proxy-Class">"wxRadioBox"</string>
+                <string name="proxy-Base class">"wxRadioBox"</string>
+                <bool name="proxy-External implementation">1</bool>
+                <bool name="proxy-Separate files">0</bool>
+                <string name="proxy-Implementation filename">""</string>
+                <string name="proxy-Header filename">""</string>
+                <string name="proxy-Member variable name">"m_MagneticPadOptCtrl"</string>
+                <string name="proxy-Label">"Magnetic Pads"</string>
+                <long name="proxy-Major dimension count">1</long>
+                <string name="proxy-Items">"Never|When creating tracks|Always"</string>
+                <long name="proxy-Initial value">0</long>
+                <string name="proxy-Help text">""</string>
+                <string name="proxy-Tooltip text">"control the capture of the pcb cursor when the mouse cursor enters a pad area"</string>
+                <string name="proxy-Background colour">""</string>
+                <string name="proxy-Foreground colour">""</string>
+                <string name="proxy-Font">""</string>
+                <bool name="proxy-Hidden">0</bool>
+                <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                <string name="proxy-Data variable">"g_MagneticPadOption"</string>
+                <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
+                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
+                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
+                <bool name="proxy-wxWANTS_CHARS">0</bool>
+                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                <string name="proxy-Custom styles">""</string>
+                <long name="proxy-X">-1</long>
+                <long name="proxy-Y">-1</long>
+                <long name="proxy-Width">-1</long>
+                <long name="proxy-Height">-1</long>
+                <string name="proxy-AlignH">"Expand"</string>
+                <string name="proxy-AlignV">"Centre"</string>
+                <long name="proxy-Stretch factor">0</long>
+                <long name="proxy-Border">5</long>
+                <bool name="proxy-wxLEFT">1</bool>
+                <bool name="proxy-wxRIGHT">1</bool>
+                <bool name="proxy-wxTOP">1</bool>
+                <bool name="proxy-wxBOTTOM">1</bool>
+                <bool name="proxy-wxSHAPED">0</bool>
+                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                <string name="proxy-Custom arguments">""</string>
+                <string name="proxy-Custom ctor arguments">""</string>
+              </document>
+              <document>
+                <string name="title">"wxRadioBox: ID_RADIOBOX3"</string>
+                <string name="type">"dialog-control-document"</string>
+                <string name="filename">""</string>
+                <string name="icon-name">"radiobox"</string>
+                <long name="is-transient">0</long>
+                <long name="owns-file">1</long>
+                <long name="title-mode">0</long>
+                <long name="locked">0</long>
+                <string name="created">"3/3/2008"</string>
+                <string name="proxy-type">"wbRadioBoxProxy"</string>
+                <string name="proxy-Id name">"ID_RADIOBOX3"</string>
+                <long name="proxy-Id value">10015</long>
+                <string name="proxy-Name">""</string>
+                <string name="proxy-Class">"wxRadioBox"</string>
+                <string name="proxy-Base class">"wxRadioBox"</string>
+                <bool name="proxy-External implementation">1</bool>
+                <bool name="proxy-Separate files">0</bool>
+                <string name="proxy-Implementation filename">""</string>
+                <string name="proxy-Header filename">""</string>
+                <string name="proxy-Member variable name">"m_MagneticTrackOptCtrl"</string>
+                <string name="proxy-Label">"Magnetic Tracks"</string>
+                <long name="proxy-Major dimension count">1</long>
+                <string name="proxy-Items">"Never|When creating tracks|Always"</string>
+                <long name="proxy-Initial value">0</long>
+                <string name="proxy-Help text">""</string>
+                <string name="proxy-Tooltip text">"control the capture of the pcb cursor when the mouse cursor enters a track"</string>
+                <string name="proxy-Background colour">""</string>
+                <string name="proxy-Foreground colour">""</string>
+                <string name="proxy-Font">""</string>
+                <bool name="proxy-Hidden">0</bool>
+                <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                <string name="proxy-Data variable">"g_MagneticTrackOption"</string>
+                <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
+                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
+                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
+                <bool name="proxy-wxWANTS_CHARS">0</bool>
+                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                <string name="proxy-Custom styles">""</string>
+                <long name="proxy-X">-1</long>
+                <long name="proxy-Y">-1</long>
+                <long name="proxy-Width">-1</long>
+                <long name="proxy-Height">-1</long>
+                <string name="proxy-AlignH">"Expand"</string>
+                <string name="proxy-AlignV">"Centre"</string>
+                <long name="proxy-Stretch factor">0</long>
+                <long name="proxy-Border">5</long>
+                <bool name="proxy-wxLEFT">1</bool>
+                <bool name="proxy-wxRIGHT">1</bool>
+                <bool name="proxy-wxTOP">1</bool>
+                <bool name="proxy-wxBOTTOM">1</bool>
+                <bool name="proxy-wxSHAPED">0</bool>
+                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                <string name="proxy-Custom arguments">""</string>
+                <string name="proxy-Custom ctor arguments">""</string>
+              </document>
               <document>
                 <string name="title">"wxButton: wxID_OK"</string>
                 <string name="type">"dialog-control-document"</string>
@@ -1351,12 +1657,25 @@
                 <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick"</string>
                 <string name="proxy-Id name">"wxID_OK"</string>
                 <long name="proxy-Id value">5100</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxButton"</string>
+                <string name="proxy-Base class">"wxButton"</string>
+                <bool name="proxy-External implementation">1</bool>
+                <bool name="proxy-Separate files">0</bool>
+                <string name="proxy-Implementation filename">""</string>
+                <string name="proxy-Header filename">""</string>
                 <string name="proxy-Member variable name">""</string>
                 <string name="proxy-Label">"&amp;OK"</string>
                 <bool name="proxy-Default">0</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Data variable">""</string>
+                <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">"DD0000"</string>
                 <string name="proxy-Font">""</string>
@@ -1370,6 +1689,8 @@
                 <bool name="proxy-wxBU_EXACTFIT">0</bool>
                 <bool name="proxy-wxNO_BORDER">0</bool>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
+                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                 <string name="proxy-Custom styles">""</string>
                 <long name="proxy-X">-1</long>
                 <long name="proxy-Y">-1</long>
@@ -1403,12 +1724,25 @@
                 <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick"</string>
                 <string name="proxy-Id name">"wxID_CANCEL"</string>
                 <long name="proxy-Id value">5101</long>
+                <string name="proxy-Name">""</string>
                 <string name="proxy-Class">"wxButton"</string>
+                <string name="proxy-Base class">"wxButton"</string>
+                <bool name="proxy-External implementation">1</bool>
+                <bool name="proxy-Separate files">0</bool>
+                <string name="proxy-Implementation filename">""</string>
+                <string name="proxy-Header filename">""</string>
                 <string name="proxy-Member variable name">""</string>
                 <string name="proxy-Label">"&amp;Cancel"</string>
                 <bool name="proxy-Default">0</bool>
                 <string name="proxy-Help text">""</string>
                 <string name="proxy-Tooltip text">""</string>
+                <string name="proxy-Data variable">""</string>
+                <string name="proxy-Data validator">""</string>
+                <string name="proxy-Data source">""</string>
+                <string name="proxy-Data class name">""</string>
+                <string name="proxy-Data class implementation filename">""</string>
+                <string name="proxy-Data class header filename">""</string>
+                <string name="proxy-Data class manager window">""</string>
                 <string name="proxy-Background colour">""</string>
                 <string name="proxy-Foreground colour">"0000FF"</string>
                 <string name="proxy-Font">""</string>
@@ -1422,6 +1756,8 @@
                 <bool name="proxy-wxBU_EXACTFIT">0</bool>
                 <bool name="proxy-wxNO_BORDER">0</bool>
                 <bool name="proxy-wxWANTS_CHARS">0</bool>
+                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
                 <string name="proxy-Custom styles">""</string>
                 <long name="proxy-X">-1</long>
                 <long name="proxy-Y">-1</long>

pcbnew/hotkeys.cpp

@@ -310,13 +310,10 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey,
             if( ItemFree )
             {
                 // no track is currently being edited - select a segment and remove it.
-
                 // @todo: possibly? pass the HK command code to PcbGeneralLocateAndDisplay() so it can restrict its search to specific item types.
-
                 // @todo: use PcbGeneralLocateAndDisplay() everywhere in this source file.
 
                 DrawStruct = PcbGeneralLocateAndDisplay();
-
                 // don't let backspace delete modules!!
                 if( DrawStruct && (DrawStruct->Type() == TYPETRACK
                                    || DrawStruct->Type() == TYPEVIA) )

pcbnew/move_or_drag_track.cpp

@@ -464,6 +464,8 @@ bool InitialiseDragParameters()
                 tSegmentToStart = TrackSegWrapper->m_Segm; // Get the segment connected to the start point
         }
     }
+	//would be nice to eliminate collinear segments here, so we don't 
+	//have to deal with that annoying "Unable to drag this segment: two collinear segments"
 
     s_StartPointVertical      = false;
     s_EndPointVertical        = false;
@@ -610,7 +612,7 @@ void WinEDA_PcbFrame::Start_MoveOneNodeOrSegment( TRACK* track, wxDC* DC, int co
     NbPtNewTrack = 0;
     EraseDragListe();
 
-    /* Change hight light net: the new one will be hightlighted */
+    /* Change highlighted net: the new one will be hightlighted */
     Old_HightLigt_Status   = g_HightLigt_Status;
     Old_HightLigth_NetCode = g_HightLigth_NetCode;
     if( g_HightLigt_Status )
@@ -670,8 +672,67 @@ void WinEDA_PcbFrame::Start_MoveOneNodeOrSegment( TRACK* track, wxDC* DC, int co
     DrawHightLight( DC, g_HightLigth_NetCode );
     DrawPanel->ManageCurseur( DrawPanel, DC, TRUE );
 }
-
+void SortTrackEndPoints(TRACK* track)
-
+{
+	//sort the track endpoints -- should not matter in terms of drawing 
+	//or producing the pcb -- but makes doing comparisons easier. 
+	wxPoint tmp; 
+	int dx = track->m_End.x - track->m_Start.x;
+	if(dx){
+		if( track->m_Start.x > track->m_End.x ){
+			tmp = track->m_Start;
+			track->m_Start = track->m_End; 
+			track->m_End = tmp; 
+		}
+	}else{
+		if( track->m_Start.y > track->m_End.y ){
+			tmp = track->m_Start;
+			track->m_Start = track->m_End; 
+			track->m_End = tmp; 
+		}
+	}
+}
+/***********************************************************************************/
+bool WinEDA_PcbFrame::MergeCollinearTracks( TRACK* track, wxDC* DC, int end )
+/***********************************************************************************/
+{
+	TRACK* testtrack = NULL; 
+	
+	testtrack = (TRACK*) Locate_Piste_Connectee( track, m_Pcb->m_Track, NULL, end );
+	if( testtrack )
+	{
+		SortTrackEndPoints(track); 
+		SortTrackEndPoints(testtrack);
+		int dx = track->m_End.x - track->m_Start.x;
+		int dy = track->m_End.y - track->m_Start.y;
+		int tdx = testtrack->m_End.x - testtrack->m_Start.x;
+		int tdy = testtrack->m_End.y - testtrack->m_Start.y;
+		
+		if( (dy * tdx == dx * tdy && dy != 0 && dx != 0 && tdy != 0 && tdx != 0) /*angle, same slope*/
+			   || (dy == 0 && tdy == 0 && dx*tdx )/*horizontal*/
+		  	   || (dx == 0 && tdx == 0 && dy*tdy )/*vertical*/ ) {
+			if(track->m_Start == testtrack->m_Start || track->m_End == testtrack->m_Start){
+				if( ( dx*tdx && testtrack->m_End.x > track->m_End.x )
+				  ||( dy*tdy && testtrack->m_End.y > track->m_End.y )){
+					track->m_End = testtrack->m_End; 
+					
+					Delete_Segment( DC, testtrack );
+					return true; 
+				}
+			}
+			if(track->m_Start == testtrack->m_End || track->m_End == testtrack->m_End){
+				if( ( dx*tdx && testtrack->m_Start.x < track->m_Start.x ) 
+				  ||( dy*tdy && testtrack->m_Start.y < track->m_Start.y )){
+					track->m_Start = testtrack->m_Start; 
+					
+					Delete_Segment( DC, testtrack );
+					return true; 
+				}
+			}
+		}
+	}
+	return false; 
+}
 /***********************************************************************************/
 void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC )
 /***********************************************************************************/
@@ -682,6 +743,9 @@ void WinEDA_PcbFrame::Start_DragTrackSegmentAndKeepSlope( TRACK* track, wxDC* DC
 
     if( !track )
         return;
+	
+	while(MergeCollinearTracks(track, DC, START)){}; 
+	while(MergeCollinearTracks(track, DC, END)){}; 
 
     s_StartSegmentPresent = s_EndSegmentPresent = TRUE;
 

pcbnew/pcbframe.cpp

@@ -231,6 +231,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father, WinEDA_App* parent,
             GridSize.y = SizeY;
         }
         m_Parent->m_EDA_Config->Read( wxT( "PcbMagPadOpt" ), &g_MagneticPadOption );
+		m_Parent->m_EDA_Config->Read( wxT( "PcbMagTrackOpt" ), &g_MagneticTrackOption );
     }
     GetScreen()->SetGrid( GridSize );
 
@@ -311,6 +312,7 @@ void WinEDA_PcbFrame::OnCloseWindow( wxCloseEvent& Event )
         m_Parent->m_EDA_Config->Write( wxT( "PcbEditGrid_X" ), (long) GridSize.x );
         m_Parent->m_EDA_Config->Write( wxT( "PcbEditGrid_Y" ), (long) GridSize.y );
         m_Parent->m_EDA_Config->Write( wxT( "PcbMagPadOpt" ), (long) g_MagneticPadOption );
+		m_Parent->m_EDA_Config->Write( wxT( "PcbMagTrackOpt" ), (long) g_MagneticTrackOption );
     }
     Destroy();
 }

pcbnew/pcbnew.h

@@ -256,7 +256,7 @@ eda_global bool g_TwoSegmentTrackBuild  // FALSE = 1 segment build, TRUE = 2 45
 #endif
 ;
 
-/* How to handle magnetic pads: feature to move the pcb cursor on a pad center */
+/* How to handle magnetic pads & tracks: feature to move the pcb cursor on a pad center / track length */
 enum MagneticPadOptionValues {
     no_effect,
     capture_cursor_in_track_tool,
@@ -268,6 +268,11 @@ eda_global int g_MagneticPadOption
 = capture_cursor_in_track_tool
 #endif
 ;
+eda_global int g_MagneticTrackOption
+#ifdef MAIN
+= capture_cursor_in_track_tool
+#endif
+;
 /* Variables to handle hightlight nets */
 eda_global bool g_HightLigt_Status;
 eda_global int  g_HightLigth_NetCode