Three more dialogs enhanced

change_log.txt

@@ -4,6 +4,18 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
 
+2007-Nov-13 UPDATE   Geoff Harland <gharlandau@yahoo.com.au>
+================================================================================
++ eeschema & pcbnew
+  * The "Page Settings" dialog box has been enhanced; it now includes a
+    wxStdDialogButtonSizer, and is also now designed to be expandable.
++ pcbnew
+  * The "DRC Control" and "Netlist:" dialog boxes have also been enhanced. Each
+    of those dialogs now includes a wxStdDialogButtonSizer and a "Cancel" button,
+    (so each of those dialogs can now (otherwise) be cancelled by pressing the
+    "Esc" key), and is also now designed to be expandable.
+
+
 2007-Nov-11 UPDATE   Dick Hollenbeck <dick@softplc.com>
 ================================================================================
 + pcbnew

pcbnew/dialog_drc.cpp

@@ -47,8 +47,6 @@ IMPLEMENT_DYNAMIC_CLASS( WinEDA_DrcFrame, wxDialog )
 BEGIN_EVENT_TABLE( WinEDA_DrcFrame, wxDialog )
 
 ////@begin WinEDA_DrcFrame event table entries
-    EVT_CLOSE( WinEDA_DrcFrame::OnCloseWindow )
-
     EVT_BUTTON( ID_DRC_RUN, WinEDA_DrcFrame::OnDrcRunClick )
 
     EVT_BUTTON( ID_STOP_CONTROL_DRC, WinEDA_DrcFrame::OnStopControlDrcClick )
@@ -57,10 +55,12 @@ BEGIN_EVENT_TABLE( WinEDA_DrcFrame, wxDialog )
 
     EVT_BUTTON( ID_LIST_UNCONNECTED_PADS, WinEDA_DrcFrame::OnListUnconnectedPadsClick )
 
-    EVT_BUTTON( wxID_CLOSE, WinEDA_DrcFrame::OnCloseClick )
-
     EVT_BUTTON( ID_BUTTON_BROWSE_RPT_FILE, WinEDA_DrcFrame::OnButtonBrowseRptFileClick )
 
+    EVT_BUTTON( wxID_OK, WinEDA_DrcFrame::OnOkClick )
+
+    EVT_BUTTON( wxID_CANCEL, WinEDA_DrcFrame::OnCancelClick )
+
 ////@end WinEDA_DrcFrame event table entries
 
 END_EVENT_TABLE()
@@ -74,16 +74,20 @@ WinEDA_DrcFrame::WinEDA_DrcFrame( )
 }
 
 WinEDA_DrcFrame::WinEDA_DrcFrame( WinEDA_PcbFrame* parent, wxDC * panelDC,
-		wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
+                                  wxWindowID id,
+                                  const wxString& caption,
+                                  const wxPoint& pos,
+                                  const wxSize& size,
+                                  long style )
 {
-	m_Parent = parent;
-	m_DC = panelDC;
- 	AbortDrc = FALSE;
+    m_Parent = parent;
+    m_DC = panelDC;
+    AbortDrc = FALSE;
 
     Create(parent, id, caption, pos, size, style);
-	
-	PutValueInLocalUnits(*m_SetClearance, g_DesignSettings.m_TrackClearence,
-			m_Parent->m_InternalUnits);
+
+    PutValueInLocalUnits( *m_SetClearance, g_DesignSettings.m_TrackClearence,
+                          m_Parent->m_InternalUnits );
 }
 
 /*!
@@ -103,6 +107,8 @@ bool WinEDA_DrcFrame::Create( wxWindow* parent, wxWindowID id, const wxString& c
     m_CreateRptCtrl = NULL;
     m_RptFilenameCtrl = NULL;
     m_logWindow = NULL;
+    Line = NULL;
+    StdDialogButtonSizer = NULL;
 ////@end WinEDA_DrcFrame member initialisation
 
 ////@begin WinEDA_DrcFrame creation
@@ -110,7 +116,7 @@ bool WinEDA_DrcFrame::Create( wxWindow* parent, wxWindowID id, const wxString& c
     wxDialog::Create( parent, id, caption, pos, size, style );
 
     CreateControls();
-    if (GetSizer())
+    if( GetSizer() )
     {
         GetSizer()->SetSizeHints(this);
     }
@@ -125,10 +131,10 @@ bool WinEDA_DrcFrame::Create( wxWindow* parent, wxWindowID id, const wxString& c
 
 void WinEDA_DrcFrame::CreateControls()
 {    
-	SetFont(*g_DialogFont);
+    SetFont( *g_DialogFont );
     
 ////@begin WinEDA_DrcFrame content construction
-    // Generated by DialogBlocks, Tue 02 Oct 2007 16:31:47 CDT (unregistered)
+    // Generated by DialogBlocks, 13/11/2007 16:40:34 (unregistered)
 
     WinEDA_DrcFrame* itemDialog1 = this;
 
@@ -136,16 +142,16 @@ void WinEDA_DrcFrame::CreateControls()
     itemDialog1->SetSizer(m_MainSizer);
 
     m_CommandSizer = new wxBoxSizer(wxHORIZONTAL);
-    m_MainSizer->Add(m_CommandSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    m_MainSizer->Add(m_CommandSizer, 0, wxGROW|wxALL, 5);
 
     wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Options"));
     wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxVERTICAL);
-    m_CommandSizer->Add(itemStaticBoxSizer4, 0, wxGROW|wxALL, 5);
+    m_CommandSizer->Add(itemStaticBoxSizer4, 0, wxALIGN_TOP|wxLEFT|wxTOP|wxBOTTOM, 5);
 
     m_ClearenceTitle = new wxStaticText( itemDialog1, wxID_STATIC, _("Clearance"), wxDefaultPosition, wxDefaultSize, 0 );
     itemStaticBoxSizer4->Add(m_ClearenceTitle, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
 
-    m_SetClearance = new wxTextCtrl( itemDialog1, ID_TEXTCTRL1, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
+    m_SetClearance = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_CLEARANCE, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
     itemStaticBoxSizer4->Add(m_SetClearance, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
     itemStaticBoxSizer4->Add(5, 5, 0, wxGROW|wxALL, 5);
@@ -158,7 +164,7 @@ void WinEDA_DrcFrame::CreateControls()
     m_Pad2PadTestCtrl->SetValue(false);
     itemStaticBoxSizer8->Add(m_Pad2PadTestCtrl, 0, wxGROW|wxALL, 5);
 
-    m_UnconnectedTestCtrl = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Include unconnected"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_UnconnectedTestCtrl = new wxCheckBox( itemDialog1, ID_CHECKBOX_UNCONNECTED, _("Include unconnected"), wxDefaultPosition, wxDefaultSize, 0 );
     m_UnconnectedTestCtrl->SetValue(false);
     itemStaticBoxSizer8->Add(m_UnconnectedTestCtrl, 0, wxGROW|wxALL, 5);
 
@@ -170,40 +176,39 @@ void WinEDA_DrcFrame::CreateControls()
     m_CreateRptCtrl->SetValue(false);
     itemStaticBoxSizer8->Add(m_CreateRptCtrl, 0, wxGROW|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxVERTICAL);
-    m_CommandSizer->Add(itemBoxSizer13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    m_CommandSizer->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer13->Add(itemBoxSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxVERTICAL);
+    m_CommandSizer->Add(itemBoxSizer14, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer14->Add(itemBoxSizer15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer14->Add(itemBoxSizer15, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxTOP, 5);
 
-    wxButton* itemButton16 = new wxButton( itemDialog1, ID_DRC_RUN, _("Test Drc"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton16->SetForegroundColour(wxColour(202, 0, 0));
-    itemBoxSizer15->Add(itemButton16, 0, wxGROW|wxALL, 5);
+    wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer15->Add(itemBoxSizer16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* itemButton17 = new wxButton( itemDialog1, ID_STOP_CONTROL_DRC, _("Stop Drc"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton17->SetForegroundColour(wxColour(0, 128, 128));
-    itemBoxSizer15->Add(itemButton17, 0, wxGROW|wxALL, 5);
+    wxButton* itemButton17 = new wxButton( itemDialog1, ID_DRC_RUN, _("Test Drc"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton17->SetForegroundColour(wxColour(202, 0, 0));
+    itemBoxSizer16->Add(itemButton17, 0, wxGROW|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer18 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer14->Add(itemBoxSizer18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxButton* itemButton18 = new wxButton( itemDialog1, ID_STOP_CONTROL_DRC, _("Stop Drc"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton18->SetForegroundColour(wxColour(0, 128, 128));
+    itemBoxSizer16->Add(itemButton18, 0, wxGROW|wxALL, 5);
 
-    wxButton* itemButton19 = new wxButton( itemDialog1, ID_ERASE_DRC_MARKERS, _("Del Markers"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton19->SetForegroundColour(wxColour(0, 128, 0));
-    itemBoxSizer18->Add(itemButton19, 0, wxGROW|wxALL, 5);
+    wxBoxSizer* itemBoxSizer19 = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer15->Add(itemBoxSizer19, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* itemButton20 = new wxButton( itemDialog1, ID_LIST_UNCONNECTED_PADS, _("List Unconn"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton20->SetForegroundColour(wxColour(0, 0, 255));
-    itemBoxSizer18->Add(itemButton20, 0, wxGROW|wxALL, 5);
+    wxButton* itemButton20 = new wxButton( itemDialog1, ID_ERASE_DRC_MARKERS, _("Del Markers"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton20->SetForegroundColour(wxColour(0, 128, 0));
+    itemBoxSizer19->Add(itemButton20, 0, wxGROW|wxALL, 5);
 
-    wxButton* itemButton21 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer13->Add(itemButton21, 0, wxGROW|wxALL, 5);
+    wxButton* itemButton21 = new wxButton( itemDialog1, ID_LIST_UNCONNECTED_PADS, _("List Unconn"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton21->SetForegroundColour(wxColour(0, 0, 255));
+    itemBoxSizer19->Add(itemButton21, 0, wxGROW|wxALL, 5);
 
     wxStaticBox* itemStaticBoxSizer22Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Report File"));
     wxStaticBoxSizer* itemStaticBoxSizer22 = new wxStaticBoxSizer(itemStaticBoxSizer22Static, wxVERTICAL);
-    itemBoxSizer13->Add(itemStaticBoxSizer22, 0, wxGROW|wxALL, 5);
+    itemBoxSizer14->Add(itemStaticBoxSizer22, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
 
     wxButton* itemButton23 = new wxButton( itemDialog1, ID_BUTTON_BROWSE_RPT_FILE, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton23->SetForegroundColour(wxColour(0, 128, 128));
@@ -213,10 +218,26 @@ void WinEDA_DrcFrame::CreateControls()
     itemStaticBoxSizer22->Add(m_RptFilenameCtrl, 0, wxGROW|wxALL, 5);
 
     wxStaticText* itemStaticText25 = new wxStaticText( itemDialog1, wxID_STATIC, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_MainSizer->Add(itemStaticText25, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    m_MainSizer->Add(itemStaticText25, 0, wxGROW|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 10);
 
     m_logWindow = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxSize(-1, 300), wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL|wxFULL_REPAINT_ON_RESIZE );
-    m_MainSizer->Add(m_logWindow, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+    m_MainSizer->Add(m_logWindow, 1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 10);
+
+    Line = new wxStaticLine( itemDialog1, ID_STATICLINE, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    m_MainSizer->Add(Line, 0, wxGROW|wxLEFT|wxRIGHT, 5);
+
+    StdDialogButtonSizer = new wxStdDialogButtonSizer;
+
+    m_MainSizer->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10);
+    wxButton* itemButton29 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton29->SetForegroundColour(wxColour(200, 0, 0));
+    StdDialogButtonSizer->AddButton(itemButton29);
+
+    wxButton* itemButton30 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton30->SetForegroundColour(wxColour(0, 0, 255));
+    StdDialogButtonSizer->AddButton(itemButton30);
+
+    StdDialogButtonSizer->Realize();
 
     // Set validators
     m_Pad2PadTestCtrl->SetValidator( wxGenericValidator(& s_Pad2PadTestOpt) );
@@ -224,13 +245,13 @@ void WinEDA_DrcFrame::CreateControls()
     m_ZonesTestCtrl->SetValidator( wxGenericValidator(& s_ZonesTestOpt) );
     m_CreateRptCtrl->SetValidator( wxGenericValidator(& s_CreateRptFileOpt) );
 ////@end WinEDA_DrcFrame content construction
-	
-	AddUnitSymbol(*m_ClearenceTitle);
-	m_RptFilenameCtrl->SetValue(s_RptFilename);
+
+    AddUnitSymbol(*m_ClearenceTitle);
+    m_RptFilenameCtrl->SetValue(s_RptFilename);
 
 
     // capture the text control's events, all of them.
-//    m_logWindow->PushEventHandler( this );    
+//  m_logWindow->PushEventHandler( this );    
 }
 
 /*!
@@ -273,7 +294,7 @@ wxIcon WinEDA_DrcFrame::GetIconResource( const wxString& name )
 
 void WinEDA_DrcFrame::OnDrcRunClick( wxCommandEvent& event )
 {
-	TestDrc(event);
+    TestDrc(event);
 }
 
 /*!
@@ -282,8 +303,10 @@ void WinEDA_DrcFrame::OnDrcRunClick( wxCommandEvent& event )
 
 void WinEDA_DrcFrame::OnStopControlDrcClick( wxCommandEvent& event )
 {
-	if ( DrcInProgress ) AbortDrc = TRUE;
-	else wxBell();
+    if( DrcInProgress )
+        AbortDrc = TRUE;
+    else
+        wxBell();
 }
 
 /*!
@@ -292,7 +315,7 @@ void WinEDA_DrcFrame::OnStopControlDrcClick( wxCommandEvent& event )
 
 void WinEDA_DrcFrame::OnEraseDrcMarkersClick( wxCommandEvent& event )
 {
-	DelDRCMarkers(event);
+    DelDRCMarkers(event);
 }
 
 /*!
@@ -301,40 +324,9 @@ void WinEDA_DrcFrame::OnEraseDrcMarkersClick( wxCommandEvent& event )
 
 void WinEDA_DrcFrame::OnListUnconnectedPadsClick( wxCommandEvent& event )
 {
-	ListUnconnectedPads(event);
-}
-
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
- */
-
-void WinEDA_DrcFrame::OnCloseClick( wxCommandEvent& event )
-{
-    s_Pad2PadTestOpt = m_Pad2PadTestCtrl->IsChecked();
-    s_UnconnectedTestOpt = m_UnconnectedTestCtrl->IsChecked();
-    s_ZonesTestOpt = m_ZonesTestCtrl->IsChecked();
-	s_CreateRptFileOpt = m_CreateRptCtrl->IsChecked();
-	Close();
+    ListUnconnectedPads(event);
 }
 
-
-
-
-
-/*!
- * wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
- */
-
-void WinEDA_DrcFrame::OnCloseWindow( wxCloseEvent& event )
-{
-    s_Pad2PadTestOpt = m_Pad2PadTestCtrl->IsChecked();
-    s_UnconnectedTestOpt = m_UnconnectedTestCtrl->IsChecked();
-    s_ZonesTestOpt = m_ZonesTestCtrl->IsChecked();
-	s_CreateRptFileOpt = m_CreateRptCtrl->IsChecked();
-    event.Skip();
-}
-
-
 /*!
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON_BROWSE_RPT_FILE
  */
@@ -342,24 +334,25 @@ void WinEDA_DrcFrame::OnCloseWindow( wxCloseEvent& event )
 void WinEDA_DrcFrame::OnButtonBrowseRptFileClick( wxCommandEvent& event )
 {
 wxString FileName, Mask(wxT("*")), Ext(wxT(".rpt"));
-	
-	FileName = m_Parent->m_CurrentScreen->m_FileName;
-	ChangeFileNameExt(FileName, wxT("-drc") + Ext);
-	Mask += Ext;
-
-	FileName = EDA_FileSelector(_("DRC Report file"),
-					wxEmptyString,		/* Chemin par defaut */
-					FileName,			/* nom fichier par defaut */
-					Ext,				/* extension par defaut */
-					Mask,				/* Masque d'affichage */
-					this,
-					wxFD_SAVE,
-					TRUE
-					);
-	if ( FileName.IsEmpty()) return;
-	
-	m_RptFilenameCtrl->SetValue(FileName);
-	s_RptFilename = FileName;
+
+    FileName = m_Parent->m_CurrentScreen->m_FileName;
+    ChangeFileNameExt(FileName, wxT("-drc") + Ext);
+    Mask += Ext;
+
+    FileName = EDA_FileSelector( _("DRC Report file"),
+                                 wxEmptyString,     /* Chemin par defaut */
+                                 FileName,          /* nom fichier par defaut */
+                                 Ext,               /* extension par defaut */
+                                 Mask,              /* Masque d'affichage */
+                                 this,
+                                 wxFD_SAVE,
+                                 TRUE
+                                 );
+    if( FileName.IsEmpty() )
+        return;
+
+    m_RptFilenameCtrl->SetValue(FileName);
+    s_RptFilename = FileName;
 }
 
 
@@ -409,3 +402,29 @@ bool WinEDA_DrcFrame::ProcessEvent( wxEvent& event )
     }
 }
 
+
+/*!
+ * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
+ */
+
+void WinEDA_DrcFrame::OnOkClick( wxCommandEvent& event )
+{
+    s_Pad2PadTestOpt = m_Pad2PadTestCtrl->IsChecked();
+    s_UnconnectedTestOpt = m_UnconnectedTestCtrl->IsChecked();
+    s_ZonesTestOpt = m_ZonesTestCtrl->IsChecked();
+    s_CreateRptFileOpt = m_CreateRptCtrl->IsChecked();
+    event.Skip();
+}
+
+
+/*!
+ * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
+ */
+
+void WinEDA_DrcFrame::OnCancelClick( wxCommandEvent& event )
+{
+////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL in WinEDA_DrcFrame.
+    // Before editing this code, remove the block markers.
+    event.Skip();
+////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL in WinEDA_DrcFrame. 
+}

pcbnew/dialog_drc.h

@@ -24,6 +24,7 @@
 
 ////@begin includes
 #include "wx/valgen.h"
+#include "wx/statline.h"
 ////@end includes
 
 /*!
@@ -32,6 +33,8 @@
 
 ////@begin forward declarations
 class wxBoxSizer;
+class wxStaticLine;
+class wxStdDialogButtonSizer;
 ////@end forward declarations
 
 /*!
@@ -40,9 +43,9 @@ class wxBoxSizer;
 
 ////@begin control identifiers
 #define ID_DIALOG 10000
-#define ID_TEXTCTRL1 10002
+#define ID_TEXTCTRL_CLEARANCE 10002
 #define ID_CHECKBOX_PAD2PAD 10009
-#define ID_CHECKBOX 10008
+#define ID_CHECKBOX_UNCONNECTED 10008
 #define ID_CHECKBOX_TEST_ZONES 10007
 #define ID_CHECKBOX_CREATE_FILE 10012
 #define ID_DRC_RUN 10003
@@ -52,7 +55,8 @@ class wxBoxSizer;
 #define ID_BUTTON_BROWSE_RPT_FILE 10011
 #define ID_TEXTCTRL_GET_RPT_FILENAME 10010
 #define ID_TEXTCTRL 10001
-#define SYMBOL_WINEDA_DRCFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
+#define ID_STATICLINE 10013
+#define SYMBOL_WINEDA_DRCFRAME_STYLE wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
 #define SYMBOL_WINEDA_DRCFRAME_TITLE _("DRC Control")
 #define SYMBOL_WINEDA_DRCFRAME_IDNAME ID_DIALOG
 #define SYMBOL_WINEDA_DRCFRAME_SIZE wxSize(400, 300)
@@ -80,7 +84,11 @@ public:
     /// Constructors
     WinEDA_DrcFrame( );
     WinEDA_DrcFrame( WinEDA_PcbFrame* parent, wxDC * panelDC,
-		wxWindowID id = SYMBOL_WINEDA_DRCFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_DRCFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_DRCFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_DRCFRAME_SIZE, long style = SYMBOL_WINEDA_DRCFRAME_STYLE );
+                     wxWindowID id = SYMBOL_WINEDA_DRCFRAME_IDNAME,
+                     const wxString& caption = SYMBOL_WINEDA_DRCFRAME_TITLE,
+                     const wxPoint& pos = SYMBOL_WINEDA_DRCFRAME_POSITION,
+                     const wxSize& size = SYMBOL_WINEDA_DRCFRAME_SIZE,
+                     long style = SYMBOL_WINEDA_DRCFRAME_STYLE );
 
     /// Creation
     bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_DRCFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_DRCFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_DRCFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_DRCFRAME_SIZE, long style = SYMBOL_WINEDA_DRCFRAME_STYLE );
@@ -93,9 +101,6 @@ public:
 
 ////@begin WinEDA_DrcFrame event handler declarations
 
-    /// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
-    void OnCloseWindow( wxCloseEvent& event );
-
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DRC_RUN
     void OnDrcRunClick( wxCommandEvent& event );
 
@@ -108,12 +113,15 @@ public:
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_LIST_UNCONNECTED_PADS
     void OnListUnconnectedPadsClick( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
-    void OnCloseClick( wxCommandEvent& event );
-
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON_BROWSE_RPT_FILE
     void OnButtonBrowseRptFileClick( wxCommandEvent& event );
 
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
+    void OnOkClick( wxCommandEvent& event );
+
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
+    void OnCancelClick( wxCommandEvent& event );
+
 ////@end WinEDA_DrcFrame event handler declarations
 
 ////@begin WinEDA_DrcFrame member function declarations
@@ -128,9 +136,9 @@ public:
     /// Should we show tooltips?
     static bool ShowToolTips();
 
-	void TestDrc(wxCommandEvent & event);
-	void DelDRCMarkers(wxCommandEvent & event);
-	void ListUnconnectedPads(wxCommandEvent & event);
+    void TestDrc(wxCommandEvent & event);
+    void DelDRCMarkers(wxCommandEvent & event);
+    void ListUnconnectedPads(wxCommandEvent & event);
 
 ////@begin WinEDA_DrcFrame member variables
     wxBoxSizer* m_MainSizer;
@@ -143,10 +151,12 @@ public:
     wxCheckBox* m_CreateRptCtrl;
     wxTextCtrl* m_RptFilenameCtrl;
     wxTextCtrl* m_logWindow;
+    wxStaticLine* Line;
+    wxStdDialogButtonSizer* StdDialogButtonSizer;
 ////@end WinEDA_DrcFrame member variables
-	WinEDA_PcbFrame * m_Parent;
-	wxDC * m_DC;
-	int m_UnconnectedCount;
+    WinEDA_PcbFrame * m_Parent;
+    wxDC * m_DC;
+    int m_UnconnectedCount;
 };
 
 #endif

pcbnew/dialog_drc.pjd

@@ -216,7 +216,6 @@
           <string name="id-suffix">""</string>
           <long name="use-xrc">0</long>
           <long name="working-mode">0</long>
-          <string name="event-handler-0">"wxEVT_CLOSE_WINDOW|OnCloseWindow|NONE||"</string>
           <string name="proxy-Id name">"ID_DIALOG"</string>
           <long name="proxy-Id value">10000</long>
           <string name="proxy-Class">"WinEDA_DrcFrame"</string>
@@ -244,14 +243,14 @@
           <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-wxDEFAULT_DIALOG_STYLE">1</bool>
+          <bool name="proxy-wxCAPTION">0</bool>
+          <bool name="proxy-wxRESIZE_BORDER">1</bool>
           <bool name="proxy-wxTHICK_FRAME">0</bool>
-          <bool name="proxy-wxSYSTEM_MENU">1</bool>
+          <bool name="proxy-wxSYSTEM_MENU">0</bool>
           <bool name="proxy-wxSTAY_ON_TOP">0</bool>
           <bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
-          <bool name="proxy-wxCLOSE_BOX">1</bool>
+          <bool name="proxy-wxCLOSE_BOX">0</bool>
           <bool name="proxy-wxMAXIMIZE_BOX">0</bool>
           <bool name="proxy-wxMINIMIZE_BOX">0</bool>
           <bool name="proxy-wxDIALOG_MODAL">0</bool>
@@ -269,7 +268,7 @@
           <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
           <bool name="proxy-wxWS_EX_BLOCK_EVENTS">1</bool>
           <bool name="proxy-wxWS_EX_TRANSIENT">0</bool>
-          <string name="proxy-Custom styles">"MAYBE_RESIZE_BORDER"</string>
+          <string name="proxy-Custom styles">""</string>
           <bool name="proxy-wxDIALOG_EX_CONTEXTHELP">0</bool>
           <bool name="proxy-Fit to content">1</bool>
           <long name="proxy-X">-1</long>
@@ -307,7 +306,7 @@
               <string name="proxy-type">"wbBoxSizerProxy"</string>
               <string name="proxy-Orientation">"Horizontal"</string>
               <string name="proxy-Member variable name">"m_CommandSizer"</string>
-              <string name="proxy-AlignH">"Centre"</string>
+              <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>
@@ -342,11 +341,11 @@
                 <string name="proxy-Static box class">"wxStaticBox"</string>
                 <string name="proxy-Orientation">"Vertical"</string>
                 <string name="proxy-AlignH">"Centre"</string>
-                <string name="proxy-AlignV">"Expand"</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>
-                <bool name="proxy-wxRIGHT">1</bool>
+                <bool name="proxy-wxRIGHT">0</bool>
                 <bool name="proxy-wxTOP">1</bool>
                 <bool name="proxy-wxBOTTOM">1</bool>
                 <bool name="proxy-wxSHAPED">0</bool>
@@ -366,7 +365,6 @@
                   <string name="proxy-type">"wbStaticTextProxy"</string>
                   <string name="proxy-Id name">"wxID_STATIC"</string>
                   <long name="proxy-Id value">5105</long>
-                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxStaticText"</string>
                   <string name="proxy-Base class">"wxStaticText"</string>
                   <bool name="proxy-External implementation">1</bool>
@@ -424,7 +422,7 @@
                   <string name="proxy-Custom ctor arguments">""</string>
                 </document>
                 <document>
-                  <string name="title">"wxTextCtrl: ID_TEXTCTRL1"</string>
+                  <string name="title">"wxTextCtrl: ID_TEXTCTRL_CLEARANCE"</string>
                   <string name="type">"dialog-control-document"</string>
                   <string name="filename">""</string>
                   <string name="icon-name">"textctrl"</string>
@@ -434,9 +432,8 @@
                   <long name="locked">0</long>
                   <string name="created">"27/3/2006"</string>
                   <string name="proxy-type">"wbTextCtrlProxy"</string>
-                  <string name="proxy-Id name">"ID_TEXTCTRL1"</string>
+                  <string name="proxy-Id name">"ID_TEXTCTRL_CLEARANCE"</string>
                   <long name="proxy-Id value">10002</long>
-                  <string name="proxy-Name">""</string>
                   <string name="proxy-Class">"wxTextCtrl"</string>
                   <string name="proxy-Base class">"wxTextCtrl"</string>
                   <bool name="proxy-External implementation">1</bool>
@@ -578,7 +575,6 @@
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
                     <string name="proxy-Id name">"ID_CHECKBOX_PAD2PAD"</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>
@@ -630,7 +626,7 @@
                     <string name="proxy-Custom ctor arguments">""</string>
                   </document>
                   <document>
-                    <string name="title">"wxCheckBox: ID_CHECKBOX"</string>
+                    <string name="title">"wxCheckBox: ID_CHECKBOX_UNCONNECTED"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
                     <string name="icon-name">"checkbox"</string>
@@ -640,9 +636,8 @@
                     <long name="locked">0</long>
                     <string name="created">"30/7/2007"</string>
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_CHECKBOX"</string>
+                    <string name="proxy-Id name">"ID_CHECKBOX_UNCONNECTED"</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>
@@ -706,7 +701,6 @@
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
                     <string name="proxy-Id name">"ID_CHECKBOX_TEST_ZONES"</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>
@@ -770,7 +764,6 @@
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
                     <string name="proxy-Id name">"ID_CHECKBOX_CREATE_FILE"</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>
@@ -823,6 +816,32 @@
                   </document>
                 </document>
               </document>
+              <document>
+                <string name="title">"Spacer"</string>
+                <string name="type">"dialog-control-document"</string>
+                <string name="filename">""</string>
+                <string name="icon-name">"spacer"</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/11/2007"</string>
+                <string name="proxy-type">"wbSpacerProxy"</string>
+                <long name="proxy-Width">5</long>
+                <long name="proxy-Height">5</long>
+                <string name="proxy-AlignH">"Centre"</string>
+                <string name="proxy-AlignV">"Centre"</string>
+                <long name="proxy-Stretch factor">1</long>
+                <long name="proxy-Border">5</long>
+                <bool name="proxy-wxLEFT">1</bool>
+                <bool name="proxy-wxRIGHT">0</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-Platform">"&lt;Any platform&gt;"</string>
+              </document>
               <document>
                 <string name="title">"wxBoxSizer V"</string>
                 <string name="type">"dialog-control-document"</string>
@@ -840,8 +859,8 @@
                 <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-wxLEFT">0</bool>
+                <bool name="proxy-wxRIGHT">0</bool>
                 <bool name="proxy-wxTOP">1</bool>
                 <bool name="proxy-wxBOTTOM">1</bool>
                 <bool name="proxy-wxSHAPED">0</bool>
@@ -865,10 +884,10 @@
                   <string name="proxy-AlignV">"Expand"</string>
                   <long name="proxy-Stretch factor">0</long>
                   <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
+                  <bool name="proxy-wxLEFT">0</bool>
                   <bool name="proxy-wxRIGHT">1</bool>
                   <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
+                  <bool name="proxy-wxBOTTOM">0</bool>
                   <bool name="proxy-wxSHAPED">0</bool>
                   <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                   <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -912,7 +931,6 @@
                       <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnDrcRunClick"</string>
                       <string name="proxy-Id name">"ID_DRC_RUN"</string>
                       <long name="proxy-Id value">10003</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>
@@ -979,7 +997,6 @@
                       <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnStopControlDrcClick"</string>
                       <string name="proxy-Id name">"ID_STOP_CONTROL_DRC"</string>
                       <long name="proxy-Id value">10004</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>
@@ -1072,7 +1089,6 @@
                       <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnEraseDrcMarkersClick"</string>
                       <string name="proxy-Id name">"ID_ERASE_DRC_MARKERS"</string>
                       <long name="proxy-Id value">10005</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>
@@ -1139,7 +1155,6 @@
                       <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnListUnconnectedPadsClick"</string>
                       <string name="proxy-Id name">"ID_LIST_UNCONNECTED_PADS"</string>
                       <long name="proxy-Id value">10006</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>
@@ -1194,73 +1209,6 @@
                     </document>
                   </document>
                 </document>
-                <document>
-                  <string name="title">"wxButton: wxID_CLOSE"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"dialogcontrol"</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">"30/7/2007"</string>
-                  <string name="proxy-type">"wbButtonProxy"</string>
-                  <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCloseClick"</string>
-                  <string name="proxy-Id name">"wxID_CLOSE"</string>
-                  <long name="proxy-Id value">5001</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;Close"</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">""</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>
-                  <bool name="proxy-wxBU_LEFT">0</bool>
-                  <bool name="proxy-wxBU_RIGHT">0</bool>
-                  <bool name="proxy-wxBU_TOP">0</bool>
-                  <bool name="proxy-wxBU_BOTTOM">0</bool>
-                  <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>
-                  <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">"wxStaticBoxSizer V"</string>
                   <string name="type">"dialog-control-document"</string>
@@ -1290,7 +1238,7 @@
                   <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-wxBOTTOM">0</bool>
                   <bool name="proxy-wxSHAPED">0</bool>
                   <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                   <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -1309,7 +1257,6 @@
                     <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnButtonBrowseRptFileClick|NONE||"</string>
                     <string name="proxy-Id name">"ID_BUTTON_BROWSE_RPT_FILE"</string>
                     <long name="proxy-Id value">10011</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>
@@ -1375,7 +1322,6 @@
                     <string name="proxy-type">"wbTextCtrlProxy"</string>
                     <string name="proxy-Id name">"ID_TEXTCTRL_GET_RPT_FILENAME"</string>
                     <long name="proxy-Id value">10010</long>
-                    <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxTextCtrl"</string>
                     <string name="proxy-Base class">"wxTextCtrl"</string>
                     <bool name="proxy-External implementation">1</bool>
@@ -1460,7 +1406,6 @@
               <string name="proxy-type">"wbStaticTextProxy"</string>
               <string name="proxy-Id name">"wxID_STATIC"</string>
               <long name="proxy-Id value">5105</long>
-              <string name="proxy-Name">""</string>
               <string name="proxy-Class">"wxStaticText"</string>
               <string name="proxy-Base class">"wxStaticText"</string>
               <bool name="proxy-External implementation">1</bool>
@@ -1506,10 +1451,10 @@
               <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>
+              <long name="proxy-Border">10</long>
               <bool name="proxy-wxLEFT">1</bool>
               <bool name="proxy-wxRIGHT">1</bool>
-              <bool name="proxy-wxTOP">1</bool>
+              <bool name="proxy-wxTOP">0</bool>
               <bool name="proxy-wxBOTTOM">0</bool>
               <bool name="proxy-wxSHAPED">0</bool>
               <bool name="proxy-wxADJUST_MINSIZE">1</bool>
@@ -1530,7 +1475,6 @@
               <string name="proxy-type">"wbTextCtrlProxy"</string>
               <string name="proxy-Id name">"ID_TEXTCTRL"</string>
               <long name="proxy-Id value">10001</long>
-              <string name="proxy-Name">""</string>
               <string name="proxy-Class">"wxTextCtrl"</string>
               <string name="proxy-Base class">"wxTextCtrl"</string>
               <bool name="proxy-External implementation">1</bool>
@@ -1587,8 +1531,8 @@
               <long name="proxy-Height">300</long>
               <string name="proxy-AlignH">"Expand"</string>
               <string name="proxy-AlignV">"Expand"</string>
-              <long name="proxy-Stretch factor">0</long>
-              <long name="proxy-Border">5</long>
+              <long name="proxy-Stretch factor">1</long>
+              <long name="proxy-Border">10</long>
               <bool name="proxy-wxLEFT">1</bool>
               <bool name="proxy-wxRIGHT">1</bool>
               <bool name="proxy-wxTOP">0</bool>
@@ -1599,6 +1543,225 @@
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
             </document>
+            <document>
+              <string name="title">"wxStaticLine: ID_STATICLINE"</string>
+              <string name="type">"dialog-control-document"</string>
+              <string name="filename">""</string>
+              <string name="icon-name">"staticline"</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/11/2007"</string>
+              <string name="proxy-type">"wbStaticLineProxy"</string>
+              <string name="proxy-Id name">"ID_STATICLINE"</string>
+              <long name="proxy-Id value">10013</long>
+              <string name="proxy-Class">"wxStaticLine"</string>
+              <string name="proxy-Base class">"wxStaticLine"</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">"Line"</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>
+              <bool name="proxy-wxLI_HORIZONTAL">1</bool>
+              <bool name="proxy-wxLI_VERTICAL">0</bool>
+              <bool name="proxy-wxNO_BORDER">0</bool>
+              <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+              <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+              <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+              <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>
+              <long name="proxy-Width">-1</long>
+              <long name="proxy-Height">-1</long>
+              <string name="proxy-AlignH">"Expand"</string>
+              <string name="proxy-AlignV">"Expand"</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">0</bool>
+              <bool name="proxy-wxBOTTOM">0</bool>
+              <bool name="proxy-wxSHAPED">0</bool>
+              <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+              <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+            </document>
+            <document>
+              <string name="title">"wxStdDialogButtonSizer"</string>
+              <string name="type">"dialog-control-document"</string>
+              <string name="filename">""</string>
+              <string name="icon-name">"sizer"</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/11/2007"</string>
+              <string name="proxy-type">"wbStdDialogButtonSizerProxy"</string>
+              <bool name="proxy-wxID_OK">1</bool>
+              <bool name="proxy-wxID_CANCEL">1</bool>
+              <bool name="proxy-wxID_YES">0</bool>
+              <bool name="proxy-wxID_NO">0</bool>
+              <bool name="proxy-wxID_HELP">0</bool>
+              <bool name="proxy-wxID_APPLY">0</bool>
+              <bool name="proxy-wxID_SAVE">0</bool>
+              <bool name="proxy-wxID_CONTEXT_HELP">0</bool>
+              <string name="proxy-Member variable name">"StdDialogButtonSizer"</string>
+              <string name="proxy-AlignH">"Expand"</string>
+              <string name="proxy-AlignV">"Centre"</string>
+              <long name="proxy-Stretch factor">0</long>
+              <long name="proxy-Border">10</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-Platform">"&lt;Any platform&gt;"</string>
+              <document>
+                <string name="title">"wxButton: wxID_OK"</string>
+                <string name="type">"dialog-control-document"</string>
+                <string name="filename">""</string>
+                <string name="icon-name">"dialogcontrol"</string>
+                <long name="is-transient">0</long>
+                <long name="owns-file">1</long>
+                <long name="title-mode">0</long>
+                <long name="locked">1</long>
+                <string name="created">"13/11/2007"</string>
+                <string name="proxy-type">"wbButtonProxy"</string>
+                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick|NONE||"</string>
+                <string name="proxy-Id name">"wxID_OK"</string>
+                <long name="proxy-Id value">5100</long>
+                <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">"C80000"</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>
+                <bool name="proxy-wxBU_LEFT">0</bool>
+                <bool name="proxy-wxBU_RIGHT">0</bool>
+                <bool name="proxy-wxBU_TOP">0</bool>
+                <bool name="proxy-wxBU_BOTTOM">0</bool>
+                <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>
+                <long name="proxy-Width">-1</long>
+                <long name="proxy-Height">-1</long>
+                <string name="proxy-AlignH">"Centre"</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_CANCEL"</string>
+                <string name="type">"dialog-control-document"</string>
+                <string name="filename">""</string>
+                <string name="icon-name">"dialogcontrol"</string>
+                <long name="is-transient">0</long>
+                <long name="owns-file">1</long>
+                <long name="title-mode">0</long>
+                <long name="locked">1</long>
+                <string name="created">"13/11/2007"</string>
+                <string name="proxy-type">"wbButtonProxy"</string>
+                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|NONE||"</string>
+                <string name="proxy-Id name">"wxID_CANCEL"</string>
+                <long name="proxy-Id value">5101</long>
+                <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>
+                <bool name="proxy-Hidden">0</bool>
+                <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                <bool name="proxy-wxBU_LEFT">0</bool>
+                <bool name="proxy-wxBU_RIGHT">0</bool>
+                <bool name="proxy-wxBU_TOP">0</bool>
+                <bool name="proxy-wxBU_BOTTOM">0</bool>
+                <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>
+                <long name="proxy-Width">-1</long>
+                <long name="proxy-Height">-1</long>
+                <string name="proxy-AlignH">"Centre"</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>
       </document>

pcbnew/dialog_netlist.cpp

@@ -52,7 +52,7 @@ BEGIN_EVENT_TABLE( WinEDA_NetlistFrame, wxDialog )
 
     EVT_BUTTON( ID_COMPILE_RATSNEST, WinEDA_NetlistFrame::OnCompileRatsnestClick )
 
-    EVT_BUTTON( wxID_CLOSE, WinEDA_NetlistFrame::OnCloseClick )
+    EVT_BUTTON( wxID_CANCEL, WinEDA_NetlistFrame::OnCancelClick )
 
 ////@end WinEDA_NetlistFrame event table entries
 
@@ -69,17 +69,16 @@ WinEDA_NetlistFrame::WinEDA_NetlistFrame( )
 WinEDA_NetlistFrame::WinEDA_NetlistFrame( WinEDA_PcbFrame* parent, wxDC * DC, 
         wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
-	m_Parent = parent;
-	m_DC = DC;
-	/* Setup the NETLIST file name according to the board file name */
-	NetNameBuffer = m_Parent->m_CurrentScreen->m_FileName;
-	ChangeFileNameExt(NetNameBuffer, NetExtBuffer);
+    m_Parent = parent;
+    m_DC = DC;
+    /* Setup the NETLIST file name according to the board file name */
+    NetNameBuffer = m_Parent->m_CurrentScreen->m_FileName;
+    ChangeFileNameExt(NetNameBuffer, NetExtBuffer);
 
     Create(parent, id, caption, pos, size, style);
 
     wxString title = GetTitle() + NetNameBuffer;
-	SetTitle(title);
-
+    SetTitle(title);
 }
 
 /*!
@@ -94,15 +93,18 @@ bool WinEDA_NetlistFrame::Create( wxWindow* parent, wxWindowID id, const wxStrin
     m_ChangeExistantModuleCtrl = NULL;
     m_DisplayWarningCtrl = NULL;
     m_MessageWindow = NULL;
+    StdDialogButtonSizer = NULL;
 ////@end WinEDA_NetlistFrame member initialisation
 
 ////@begin WinEDA_NetlistFrame creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
+    SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
     wxDialog::Create( parent, id, caption, pos, size, style );
 
     CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
+    if (GetSizer())
+    {
+        GetSizer()->SetSizeHints(this);
+    }
     Centre();
 ////@end WinEDA_NetlistFrame creation
     return true;
@@ -114,9 +116,9 @@ bool WinEDA_NetlistFrame::Create( wxWindow* parent, wxWindowID id, const wxStrin
 
 void WinEDA_NetlistFrame::CreateControls()
 {    
-	SetFont(*g_DialogFont);
+    SetFont( *g_DialogFont );
 ////@begin WinEDA_NetlistFrame content construction
-    // Generated by DialogBlocks, 26/02/2006 18:24:19 (unregistered)
+    // Generated by DialogBlocks, 13/11/2007 15:31:19 (unregistered)
 
     WinEDA_NetlistFrame* itemDialog1 = this;
 
@@ -124,40 +126,40 @@ void WinEDA_NetlistFrame::CreateControls()
     itemDialog1->SetSizer(itemBoxSizer2);
 
     wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
 
     wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 
-    wxString m_Select_By_TimestampStrings[] = {
-        _("Reference"),
-        _("Timestamp")
-    };
-    m_Select_By_Timestamp = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Module Selection:"), wxDefaultPosition, wxDefaultSize, 2, m_Select_By_TimestampStrings, 1, wxRA_SPECIFY_COLS );
+    wxArrayString m_Select_By_TimestampStrings;
+    m_Select_By_TimestampStrings.Add(_("Reference"));
+    m_Select_By_TimestampStrings.Add(_("Timestamp"));
+    m_Select_By_Timestamp = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Module Selection:"), wxDefaultPosition, wxDefaultSize, m_Select_By_TimestampStrings, 1, wxRA_SPECIFY_COLS );
+    m_Select_By_Timestamp->SetSelection(0);
     itemBoxSizer4->Add(m_Select_By_Timestamp, 0, wxGROW|wxALL, 5);
 
-    wxString m_DeleteBadTracksStrings[] = {
-        _("Keep"),
-        _("Delete")
-    };
-    m_DeleteBadTracks = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Bad Tracks Deletion:"), wxDefaultPosition, wxDefaultSize, 2, m_DeleteBadTracksStrings, 1, wxRA_SPECIFY_COLS );
+    wxArrayString m_DeleteBadTracksStrings;
+    m_DeleteBadTracksStrings.Add(_("Keep"));
+    m_DeleteBadTracksStrings.Add(_("Delete"));
+    m_DeleteBadTracks = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Bad Tracks Deletion:"), wxDefaultPosition, wxDefaultSize, m_DeleteBadTracksStrings, 1, wxRA_SPECIFY_COLS );
+    m_DeleteBadTracks->SetSelection(0);
     itemBoxSizer4->Add(m_DeleteBadTracks, 0, wxGROW|wxALL, 5);
 
-    wxString m_ChangeExistantModuleCtrlStrings[] = {
-        _("Keep"),
-        _("Change")
-    };
-    m_ChangeExistantModuleCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("Exchange Module:"), wxDefaultPosition, wxDefaultSize, 2, m_ChangeExistantModuleCtrlStrings, 1, wxRA_SPECIFY_COLS );
+    wxArrayString m_ChangeExistantModuleCtrlStrings;
+    m_ChangeExistantModuleCtrlStrings.Add(_("Keep"));
+    m_ChangeExistantModuleCtrlStrings.Add(_("Change"));
+    m_ChangeExistantModuleCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("Exchange Module:"), wxDefaultPosition, wxDefaultSize, m_ChangeExistantModuleCtrlStrings, 1, wxRA_SPECIFY_COLS );
+    m_ChangeExistantModuleCtrl->SetSelection(0);
     itemBoxSizer4->Add(m_ChangeExistantModuleCtrl, 0, wxGROW|wxALL, 5);
 
     m_DisplayWarningCtrl = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Display Warnings"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_DisplayWarningCtrl->SetValue(false);
-    itemBoxSizer4->Add(m_DisplayWarningCtrl, 0, wxGROW|wxALL, 5);
+    itemBoxSizer4->Add(m_DisplayWarningCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
 
-    itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer3->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer3->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer3->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 
     wxButton* itemButton11 = new wxButton( itemDialog1, ID_OPEN_NELIST, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
     itemButton11->SetForegroundColour(wxColour(217, 0, 0));
@@ -175,12 +177,20 @@ void WinEDA_NetlistFrame::CreateControls()
     itemButton14->SetForegroundColour(wxColour(0, 0, 132));
     itemBoxSizer10->Add(itemButton14, 0, wxGROW|wxALL, 5);
 
-    wxButton* itemButton15 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton15->SetForegroundColour(wxColour(128, 0, 128));
-    itemBoxSizer10->Add(itemButton15, 0, wxGROW|wxALL, 5);
-
     m_MessageWindow = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxSize(-1, 120), wxTE_MULTILINE|wxTE_READONLY );
-    itemBoxSizer2->Add(m_MessageWindow, 0, wxGROW|wxALL, 5);
+    itemBoxSizer2->Add(m_MessageWindow, 1, wxGROW|wxALL, 10);
+
+    wxStaticLine* itemStaticLine16 = new wxStaticLine( itemDialog1, ID_STATICLINE, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    itemBoxSizer2->Add(itemStaticLine16, 0, wxGROW|wxLEFT|wxRIGHT, 5);
+
+    StdDialogButtonSizer = new wxStdDialogButtonSizer;
+
+    itemBoxSizer2->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10);
+    wxButton* itemButton18 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton18->SetForegroundColour(wxColour(0, 0, 255));
+    StdDialogButtonSizer->AddButton(itemButton18);
+
+    StdDialogButtonSizer->Realize();
 
     // Set validators
     m_DisplayWarningCtrl->SetValidator( wxGenericValidator(& DisplayWarning) );
@@ -227,7 +237,7 @@ wxIcon WinEDA_NetlistFrame::GetIconResource( const wxString& name )
 
 void WinEDA_NetlistFrame::OnOpenNelistClick( wxCommandEvent& event )
 {
-	Set_NetlisteName(event);
+    Set_NetlisteName(event);
 }
 
 /*!
@@ -236,7 +246,7 @@ void WinEDA_NetlistFrame::OnOpenNelistClick( wxCommandEvent& event )
 
 void WinEDA_NetlistFrame::OnReadNetlistFileClick( wxCommandEvent& event )
 {
-	ReadPcbNetlist(event);
+    ReadPcbNetlist(event);
 }
 
 /*!
@@ -254,16 +264,14 @@ void WinEDA_NetlistFrame::OnTestNetlistClick( wxCommandEvent& event )
 
 void WinEDA_NetlistFrame::OnCompileRatsnestClick( wxCommandEvent& event )
 {
-	m_Parent->Compile_Ratsnest(m_DC, TRUE);
+    m_Parent->Compile_Ratsnest(m_DC, TRUE);
 }
 
 /*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
+ * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
  */
 
-void WinEDA_NetlistFrame::OnCloseClick( wxCommandEvent& event )
+void WinEDA_NetlistFrame::OnCancelClick( wxCommandEvent& event )
 {
-    Close();
+    EndModal( -1 );
 }
-
-

pcbnew/dialog_netlist.h

@@ -21,6 +21,7 @@
 
 ////@begin includes
 #include "wx/valgen.h"
+#include "wx/statline.h"
 ////@end includes
 
 /*!
@@ -28,6 +29,7 @@
  */
 
 ////@begin forward declarations
+class wxStdDialogButtonSizer;
 ////@end forward declarations
 
 /*!
@@ -36,11 +38,6 @@
 
 ////@begin control identifiers
 #define ID_DIALOG 10000
-#define SYMBOL_WINEDA_NETLISTFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
-#define SYMBOL_WINEDA_NETLISTFRAME_TITLE _("Netlist: ")
-#define SYMBOL_WINEDA_NETLISTFRAME_IDNAME ID_DIALOG
-#define SYMBOL_WINEDA_NETLISTFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_WINEDA_NETLISTFRAME_POSITION wxDefaultPosition
 #define ID_RADIOBOX 10005
 #define ID_RADIOBOX1 10006
 #define ID_RADIOBOX2 10007
@@ -50,6 +47,12 @@
 #define ID_TEST_NETLIST 10003
 #define ID_COMPILE_RATSNEST 10004
 #define ID_TEXTCTRL 10009
+#define ID_STATICLINE 10010
+#define SYMBOL_WINEDA_NETLISTFRAME_STYLE wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
+#define SYMBOL_WINEDA_NETLISTFRAME_TITLE _("Netlist: ")
+#define SYMBOL_WINEDA_NETLISTFRAME_IDNAME ID_DIALOG
+#define SYMBOL_WINEDA_NETLISTFRAME_SIZE wxSize(400, 300)
+#define SYMBOL_WINEDA_NETLISTFRAME_POSITION wxDefaultPosition
 ////@end control identifiers
 
 /*!
@@ -95,8 +98,8 @@ public:
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_COMPILE_RATSNEST
     void OnCompileRatsnestClick( wxCommandEvent& event );
 
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
-    void OnCloseClick( wxCommandEvent& event );
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
+    void OnCancelClick( wxCommandEvent& event );
 
 ////@end WinEDA_NetlistFrame event handler declarations
 
@@ -112,17 +115,16 @@ public:
     /// Should we show tooltips?
     static bool ShowToolTips();
 
-	void ReadPcbNetlist(wxCommandEvent& event);
-	void Set_NetlisteName(wxCommandEvent& event);
-	bool OpenNetlistFile(wxCommandEvent& event);
-	int BuildListeNetModules(wxCommandEvent& event, wxArrayString & BufName);
-	void ModulesControle(wxCommandEvent& event);
-	int ReadListeModules(const wxString * RefCmp, long TimeStamp, wxString & NameModule);
-	int SetPadNetName( char * Line, MODULE * Module);
-	MODULE * ReadNetModule( char * Text,
-						int * UseFichCmp, int TstOnly);
-	void AddToList(const wxString & NameLibCmp, const wxString & NameCmp,int TimeStamp );
-	void LoadListeModules(wxDC *DC);
+    void ReadPcbNetlist(wxCommandEvent& event);
+    void Set_NetlisteName(wxCommandEvent& event);
+    bool OpenNetlistFile(wxCommandEvent& event);
+    int BuildListeNetModules(wxCommandEvent& event, wxArrayString & BufName);
+    void ModulesControle(wxCommandEvent& event);
+    int ReadListeModules(const wxString * RefCmp, long TimeStamp, wxString & NameModule);
+    int SetPadNetName( char * Line, MODULE * Module);
+    MODULE * ReadNetModule( char * Text, int * UseFichCmp, int TstOnly);
+    void AddToList(const wxString & NameLibCmp, const wxString & NameCmp,int TimeStamp );
+    void LoadListeModules(wxDC *DC);
 
 ////@begin WinEDA_NetlistFrame member variables
     wxRadioBox* m_Select_By_Timestamp;
@@ -130,9 +132,10 @@ public:
     wxRadioBox* m_ChangeExistantModuleCtrl;
     wxCheckBox* m_DisplayWarningCtrl;
     wxTextCtrl* m_MessageWindow;
+    wxStdDialogButtonSizer* StdDialogButtonSizer;
 ////@end WinEDA_NetlistFrame member variables
-	WinEDA_PcbFrame * m_Parent;
-	wxDC * m_DC;
+    WinEDA_PcbFrame * m_Parent;
+    wxDC * m_DC;
 };
 
 #endif

pcbnew/dialog_netlist.pjd

-<?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">23</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,21 @@
     <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="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>
   </header>
   <data>
     <document>
@@ -174,7 +188,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>
@@ -198,7 +212,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">"ID_DIALOG"</string>
           <long name="proxy-Id value">10000</long>
           <string name="proxy-Class">"WinEDA_NetlistFrame"</string>
@@ -219,14 +236,21 @@
           <bool name="proxy-Hidden">0</bool>
           <bool name="proxy-Enabled">1</bool>
           <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-          <bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
-          <bool name="proxy-wxCAPTION">1</bool>
-          <bool name="proxy-wxRESIZE_BORDER">0</bool>
+          <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">1</bool>
+          <bool name="proxy-wxCAPTION">0</bool>
+          <bool name="proxy-wxRESIZE_BORDER">1</bool>
           <bool name="proxy-wxTHICK_FRAME">0</bool>
-          <bool name="proxy-wxSYSTEM_MENU">1</bool>
+          <bool name="proxy-wxSYSTEM_MENU">0</bool>
           <bool name="proxy-wxSTAY_ON_TOP">0</bool>
           <bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
-          <bool name="proxy-wxCLOSE_BOX">1</bool>
+          <bool name="proxy-wxCLOSE_BOX">0</bool>
           <bool name="proxy-wxMAXIMIZE_BOX">0</bool>
           <bool name="proxy-wxMINIMIZE_BOX">0</bool>
           <bool name="proxy-wxDIALOG_MODAL">0</bool>
@@ -237,18 +261,21 @@
           <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>
           <bool name="proxy-wxWS_EX_TRANSIENT">0</bool>
-          <string name="proxy-Custom styles">"MAYBE_RESIZE_BORDER"</string>
+          <string name="proxy-Custom styles">""</string>
           <bool name="proxy-wxDIALOG_EX_CONTEXTHELP">0</bool>
           <bool name="proxy-Fit to content">1</bool>
           <long name="proxy-X">-1</long>
           <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 V"</string>
@@ -279,14 +306,14 @@
               <string name="proxy-type">"wbBoxSizerProxy"</string>
               <string name="proxy-Orientation">"Horizontal"</string>
               <string name="proxy-Member variable name">""</string>
-              <string name="proxy-AlignH">"Centre"</string>
+              <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-wxBOTTOM">0</bool>
               <bool name="proxy-wxSHAPED">0</bool>
               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -308,8 +335,8 @@
                 <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-wxLEFT">0</bool>
+                <bool name="proxy-wxRIGHT">0</bool>
                 <bool name="proxy-wxTOP">1</bool>
                 <bool name="proxy-wxBOTTOM">1</bool>
                 <bool name="proxy-wxSHAPED">0</bool>
@@ -330,9 +357,16 @@
                   <string name="proxy-Id name">"ID_RADIOBOX"</string>
                   <long name="proxy-Id value">10005</long>
                   <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_Select_By_Timestamp"</string>
                   <string name="proxy-Label">"Module Selection:"</string>
                   <long name="proxy-Major dimension count">1</long>
+                  <string name="proxy-Items">"Reference|Timestamp"</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>
@@ -343,10 +377,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">"Reference|Timestamp"</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>
@@ -380,9 +420,16 @@
                   <string name="proxy-Id name">"ID_RADIOBOX1"</string>
                   <long name="proxy-Id value">10006</long>
                   <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_DeleteBadTracks"</string>
                   <string name="proxy-Label">"Bad Tracks Deletion:"</string>
                   <long name="proxy-Major dimension count">1</long>
+                  <string name="proxy-Items">"Keep|Delete"</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>
@@ -393,10 +440,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">"Keep|Delete"</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>
@@ -430,9 +483,16 @@
                   <string name="proxy-Id name">"ID_RADIOBOX2"</string>
                   <long name="proxy-Id value">10007</long>
                   <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_ChangeExistantModuleCtrl"</string>
                   <string name="proxy-Label">"Exchange Module:"</string>
                   <long name="proxy-Major dimension count">1</long>
+                  <string name="proxy-Items">"Keep|Change"</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>
@@ -443,10 +503,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">"Keep|Change"</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>
@@ -480,6 +546,11 @@
                   <string name="proxy-Id name">"ID_CHECKBOX"</string>
                   <long name="proxy-Id value">10008</long>
                   <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_DisplayWarningCtrl"</string>
                   <string name="proxy-Label">"Display Warnings"</string>
                   <bool name="proxy-Initial value">0</bool>
@@ -487,6 +558,11 @@
                   <string name="proxy-Tooltip text">""</string>
                   <string name="proxy-Data variable">"DisplayWarning"</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>
                   <string name="proxy-Background colour">""</string>
                   <string name="proxy-Foreground colour">""</string>
                   <string name="proxy-Font">""</string>
@@ -498,6 +574,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>
@@ -510,7 +588,7 @@
                   <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-wxBOTTOM">0</bool>
                   <bool name="proxy-wxSHAPED">0</bool>
                   <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                   <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -533,7 +611,7 @@
                 <long name="proxy-Height">5</long>
                 <string name="proxy-AlignH">"Centre"</string>
                 <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
+                <long name="proxy-Stretch factor">1</long>
                 <long name="proxy-Border">5</long>
                 <bool name="proxy-wxLEFT">1</bool>
                 <bool name="proxy-wxRIGHT">1</bool>
@@ -561,8 +639,8 @@
                 <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-wxLEFT">0</bool>
+                <bool name="proxy-wxRIGHT">0</bool>
                 <bool name="proxy-wxTOP">1</bool>
                 <bool name="proxy-wxBOTTOM">1</bool>
                 <bool name="proxy-wxSHAPED">0</bool>
@@ -580,15 +658,27 @@
                   <long name="locked">0</long>
                   <string name="created">"26/3/2006"</string>
                   <string name="proxy-type">"wbButtonProxy"</string>
-                  <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOpenNelistClick"</string>
+                  <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOpenNelistClick|||"</string>
                   <string name="proxy-Id name">"ID_OPEN_NELIST"</string>
                   <long name="proxy-Id value">10001</long>
                   <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">"Select"</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">"D90000"</string>
                   <string name="proxy-Font">""</string>
@@ -602,6 +692,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>
@@ -636,11 +728,23 @@
                   <string name="proxy-Id name">"ID_READ_NETLIST_FILE"</string>
                   <long name="proxy-Id value">10002</long>
                   <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">"Read"</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">"008000"</string>
                   <string name="proxy-Font">""</string>
@@ -654,6 +758,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>
@@ -688,11 +794,23 @@
                   <string name="proxy-Id name">"ID_TEST_NETLIST"</string>
                   <long name="proxy-Id value">10003</long>
                   <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">"Module Test"</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">"008080"</string>
                   <string name="proxy-Font">""</string>
@@ -706,6 +824,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>
@@ -740,11 +860,23 @@
                   <string name="proxy-Id name">"ID_COMPILE_RATSNEST"</string>
                   <long name="proxy-Id value">10004</long>
                   <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">"Compile"</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">"000084"</string>
                   <string name="proxy-Font">""</string>
@@ -758,58 +890,8 @@
                   <bool name="proxy-wxBU_EXACTFIT">0</bool>
                   <bool name="proxy-wxNO_BORDER">0</bool>
                   <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>
-                  <string name="title">"wxButton: wxID_CLOSE"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"dialogcontrol"</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">"26/3/2006"</string>
-                  <string name="proxy-type">"wbButtonProxy"</string>
-                  <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCloseClick"</string>
-                  <string name="proxy-Id name">"wxID_CLOSE"</string>
-                  <long name="proxy-Id value">5001</long>
-                  <string name="proxy-Class">"wxButton"</string>
-                  <string name="proxy-Member variable name">""</string>
-                  <string name="proxy-Label">"&amp;Close"</string>
-                  <bool name="proxy-Default">0</bool>
-                  <string name="proxy-Help text">""</string>
-                  <string name="proxy-Tooltip text">""</string>
-                  <string name="proxy-Background colour">""</string>
-                  <string name="proxy-Foreground colour">"800080"</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>
-                  <bool name="proxy-wxBU_LEFT">0</bool>
-                  <bool name="proxy-wxBU_RIGHT">0</bool>
-                  <bool name="proxy-wxBU_TOP">0</bool>
-                  <bool name="proxy-wxBU_BOTTOM">0</bool>
-                  <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>
@@ -845,6 +927,11 @@
               <string name="proxy-Id name">"ID_TEXTCTRL"</string>
               <long name="proxy-Id value">10009</long>
               <string name="proxy-Class">"wxTextCtrl"</string>
+              <string name="proxy-Base class">"wxTextCtrl"</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_MessageWindow"</string>
               <string name="proxy-Initial value">""</string>
               <long name="proxy-Max length">0</long>
@@ -858,6 +945,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-wxTE_MULTILINE">1</bool>
               <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
               <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
@@ -871,8 +963,9 @@
               <bool name="proxy-wxTE_CENTRE">0</bool>
               <bool name="proxy-wxTE_RIGHT">0</bool>
               <bool name="proxy-wxHSCROLL">0</bool>
-              <bool name="proxy-wxTE_LINEWRAP">0</bool>
+              <bool name="proxy-wxTE_CHARWRAP">0</bool>
               <bool name="proxy-wxTE_WORDWRAP">0</bool>
+              <bool name="proxy-wxTE_CAPITALIZE">0</bool>
               <bool name="proxy-wxNO_BORDER">0</bool>
               <bool name="proxy-wxSIMPLE_BORDER">0</bool>
               <bool name="proxy-wxDOUBLE_BORDER">0</bool>
@@ -880,6 +973,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>
@@ -887,8 +982,8 @@
               <long name="proxy-Height">120</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>
+              <long name="proxy-Stretch factor">1</long>
+              <long name="proxy-Border">10</long>
               <bool name="proxy-wxLEFT">1</bool>
               <bool name="proxy-wxRIGHT">1</bool>
               <bool name="proxy-wxTOP">1</bool>
@@ -899,6 +994,159 @@
               <string name="proxy-Custom arguments">""</string>
               <string name="proxy-Custom ctor arguments">""</string>
             </document>
+            <document>
+              <string name="title">"wxStaticLine: ID_STATICLINE"</string>
+              <string name="type">"dialog-control-document"</string>
+              <string name="filename">""</string>
+              <string name="icon-name">"staticline"</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/11/2007"</string>
+              <string name="proxy-type">"wbStaticLineProxy"</string>
+              <string name="proxy-Id name">"ID_STATICLINE"</string>
+              <long name="proxy-Id value">10010</long>
+              <string name="proxy-Class">"wxStaticLine"</string>
+              <string name="proxy-Base class">"wxStaticLine"</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-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>
+              <bool name="proxy-wxLI_HORIZONTAL">1</bool>
+              <bool name="proxy-wxLI_VERTICAL">0</bool>
+              <bool name="proxy-wxNO_BORDER">0</bool>
+              <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+              <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+              <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+              <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>
+              <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">0</bool>
+              <bool name="proxy-wxBOTTOM">0</bool>
+              <bool name="proxy-wxSHAPED">0</bool>
+              <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+              <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+            </document>
+            <document>
+              <string name="title">"wxStdDialogButtonSizer"</string>
+              <string name="type">"dialog-control-document"</string>
+              <string name="filename">""</string>
+              <string name="icon-name">"sizer"</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/11/2007"</string>
+              <string name="proxy-type">"wbStdDialogButtonSizerProxy"</string>
+              <bool name="proxy-wxID_OK">0</bool>
+              <bool name="proxy-wxID_CANCEL">1</bool>
+              <bool name="proxy-wxID_YES">0</bool>
+              <bool name="proxy-wxID_NO">0</bool>
+              <bool name="proxy-wxID_HELP">0</bool>
+              <bool name="proxy-wxID_APPLY">0</bool>
+              <bool name="proxy-wxID_SAVE">0</bool>
+              <bool name="proxy-wxID_CONTEXT_HELP">0</bool>
+              <string name="proxy-Member variable name">"StdDialogButtonSizer"</string>
+              <string name="proxy-AlignH">"Expand"</string>
+              <string name="proxy-AlignV">"Centre"</string>
+              <long name="proxy-Stretch factor">0</long>
+              <long name="proxy-Border">10</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-Platform">"&lt;Any platform&gt;"</string>
+              <document>
+                <string name="title">"wxButton: wxID_CANCEL"</string>
+                <string name="type">"dialog-control-document"</string>
+                <string name="filename">""</string>
+                <string name="icon-name">"dialogcontrol"</string>
+                <long name="is-transient">0</long>
+                <long name="owns-file">1</long>
+                <long name="title-mode">0</long>
+                <long name="locked">1</long>
+                <string name="created">"13/11/2007"</string>
+                <string name="proxy-type">"wbButtonProxy"</string>
+                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|NONE||"</string>
+                <string name="proxy-Id name">"wxID_CANCEL"</string>
+                <long name="proxy-Id value">5101</long>
+                <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>
+                <bool name="proxy-Hidden">0</bool>
+                <bool name="proxy-Enabled">1</bool>
+                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                <bool name="proxy-wxBU_LEFT">0</bool>
+                <bool name="proxy-wxBU_RIGHT">0</bool>
+                <bool name="proxy-wxBU_TOP">0</bool>
+                <bool name="proxy-wxBU_BOTTOM">0</bool>
+                <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>
+                <long name="proxy-Width">-1</long>
+                <long name="proxy-Height">-1</long>
+                <string name="proxy-AlignH">"Centre"</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>
       </document>

share/setpage.cpp

@@ -3,13 +3,23 @@
 // Purpose:     
 // Author:      jean-pierre Charras
 // Modified by: 
-// Created:     06/02/2006 20:53:09
+// Created:     13/11/2007 09:11:27
 // RCS-ID:      
 // Copyright:   License GNU
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
 
-// Generated by DialogBlocks (unregistered), 06/02/2006 20:53:09
+/* The "Page Settings" dialog box created by this file (and setpage.h)
+ * contains seven checkboxes which *are* provided when that dialog box is
+ * invoked in EESchema, but which are *not* provided when that dialog box is
+ * invoked in Pcbnew instead. As such, various lines within this file
+ * (and setpage.h) are included on an appropriately conditional basis.
+ * (That aspect should be noted if the contents of this file (and setpage.h)
+ * are ever consequently modified as a consequence of setpage.pjd being
+ * opened in DialogBlocks (as that file now incorporates those checkboxes).)
+ */
+
+// Generated by DialogBlocks (unregistered), 13/11/2007 09:11:27
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "setpage.h"
@@ -39,27 +49,28 @@
 #endif
 
 #define NB_ITEMS 11
-Ki_PageDescr * SheetList[NB_ITEMS+1] =
+Ki_PageDescr * SheetList[NB_ITEMS + 1] =
 {
-	&g_Sheet_A4, &g_Sheet_A3, &g_Sheet_A2, &g_Sheet_A1, &g_Sheet_A0,
-	&g_Sheet_A, &g_Sheet_B, &g_Sheet_C, &g_Sheet_D, &g_Sheet_E,
-	&g_Sheet_user, NULL
+    &g_Sheet_A4, &g_Sheet_A3, &g_Sheet_A2, &g_Sheet_A1, &g_Sheet_A0,
+    &g_Sheet_A, &g_Sheet_B, &g_Sheet_C, &g_Sheet_D, &g_Sheet_E,
+    &g_Sheet_user, NULL
 };
 
 #include "setpage.h"
 
 ////@begin XPM images
+
 ////@end XPM images
 
 /******************************************************************/
 void WinEDA_DrawFrame::Process_PageSettings(wxCommandEvent& event)
 /******************************************************************/
 /* Creation de la fenetre de configuration
-*/
+ */
 {
-	WinEDA_SetPageFrame frame(this);
-	frame.ShowModal();
-	ReDrawPanel();
+    WinEDA_SetPageFrame frame(this);
+    frame.ShowModal();
+    ReDrawPanel();
 }
 
 /*!
@@ -68,6 +79,7 @@ void WinEDA_DrawFrame::Process_PageSettings(wxCommandEvent& event)
 
 IMPLEMENT_DYNAMIC_CLASS( WinEDA_SetPageFrame, wxDialog )
 
+
 /*!
  * WinEDA_SetPageFrame event table definition
  */
@@ -85,227 +97,358 @@ BEGIN_EVENT_TABLE( WinEDA_SetPageFrame, wxDialog )
 
 END_EVENT_TABLE()
 
+
 /*!
  * WinEDA_SetPageFrame constructors
  */
 
 WinEDA_SetPageFrame::WinEDA_SetPageFrame( )
 {
+    Init();
 }
 
 WinEDA_SetPageFrame::WinEDA_SetPageFrame( WinEDA_DrawFrame* parent, wxWindowID id,
-				const wxString& caption, const wxPoint& pos,
-				const wxSize& size, long style )
+                                          const wxString& caption, const wxPoint& pos,
+                                          const wxSize& size, long style )
 {
-wxString msg;
-	
-	m_ParentDrawFrame = parent;
-	m_Screen = m_ParentDrawFrame->m_CurrentScreen;
-	m_Modified = FALSE;
-	m_SelectedSheet = NULL;
+    Init();
+
+    wxString msg;
+
+    m_ParentDrawFrame = parent;
+    m_Screen = m_ParentDrawFrame->m_CurrentScreen;
+    m_Modified = FALSE;
+    m_SelectedSheet = NULL;
     m_CurrentSelection = 0;
-	SearchPageSizeSelection();
+    SearchPageSizeSelection();
     Create(parent, id, caption, pos, size, style);
-	// Init display value for sheet User size
-	wxString format = m_TextSheetCount->GetLabel();
-	msg.Printf(format, m_Screen->m_NumberOfSheet);
-	m_TextSheetCount->SetLabel(msg);
-	format = m_TextSheetNumber->GetLabel();
-	msg.Printf(format, m_Screen->m_SheetNumber);
-	m_TextSheetNumber->SetLabel(msg);
-	if ( g_UnitMetric )
-	{
-		UserSizeX = (double)g_Sheet_user.m_Size.x * 25.4 / 1000 ;
-		UserSizeY = (double)g_Sheet_user.m_Size.y * 25.4 / 1000;
-		msg.Printf( wxT("%.2f"), UserSizeX);
-		m_TextUserSizeX->SetValue(msg);
-		msg.Printf( wxT("%.2f"), UserSizeY);
-		m_TextUserSizeY->SetValue(msg);
-	}
-	else
-	{
-		UserSizeX = (double)g_Sheet_user.m_Size.x / 1000;
-		UserSizeY = (double)g_Sheet_user.m_Size.y / 1000;
-		msg.Printf( wxT("%.3f"), UserSizeX );
-		m_TextUserSizeX->SetValue(msg);
-		msg.Printf( wxT("%.3f"), UserSizeY );
-		m_TextUserSizeY->SetValue(msg);
-	}
+    // Init display value for sheet User size
+    wxString format = m_TextSheetCount->GetLabel();
+    msg.Printf(format, m_Screen->m_NumberOfSheet);
+    m_TextSheetCount->SetLabel(msg);
+    format = m_TextSheetNumber->GetLabel();
+    msg.Printf(format, m_Screen->m_SheetNumber);
+    m_TextSheetNumber->SetLabel(msg);
+    if( g_UnitMetric )
+    {
+        UserSizeX = (double)g_Sheet_user.m_Size.x * 25.4 / 1000;
+        UserSizeY = (double)g_Sheet_user.m_Size.y * 25.4 / 1000;
+        msg.Printf( wxT("%.2f"), UserSizeX );
+        m_TextUserSizeX->SetValue(msg);
+        msg.Printf( wxT("%.2f"), UserSizeY );
+        m_TextUserSizeY->SetValue(msg);
+    }
+    else
+    {
+        UserSizeX = (double)g_Sheet_user.m_Size.x / 1000;
+        UserSizeY = (double)g_Sheet_user.m_Size.y / 1000;
+        msg.Printf( wxT("%.3f"), UserSizeX );
+        m_TextUserSizeX->SetValue(msg);
+        msg.Printf( wxT("%.3f"), UserSizeY );
+        m_TextUserSizeY->SetValue(msg);
+    }
 }
 
+
 /*!
  * WinEDA_SetPageFrame creator
  */
 
 bool WinEDA_SetPageFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
 {
+////@begin WinEDA_SetPageFrame creation
+    wxDialog::Create( parent, id, caption, pos, size, style );
+
+    CreateControls();
+    if( GetSizer() )
+    {
+        GetSizer()->SetSizeHints(this);
+    }
+    Centre();
+////@end WinEDA_SetPageFrame creation
+    return true;
+}
+
+
+/*!
+ * WinEDA_SetPageFrame destructor
+ */
+
+WinEDA_SetPageFrame::~WinEDA_SetPageFrame()
+{
+////@begin WinEDA_SetPageFrame destruction
+////@end WinEDA_SetPageFrame destruction
+}
+
+
+/*!
+ * Member initialisation
+ */
+
+void WinEDA_SetPageFrame::Init()
+{
+
+// NOTE: The following code has been modified by initialising the seven
+// checkboxes *only* within the EESchema version of this dialog box.
+
 ////@begin WinEDA_SetPageFrame member initialisation
+    OuterSizer = NULL;
+    MainSizer = NULL;
+    LeftColumnSizer = NULL;
     m_PageSizeBox = NULL;
+    UserSizeXSizer = NULL;
+    UserPageSizeX = NULL;
     m_TextUserSizeX = NULL;
+    UserSizeYSizer = NULL;
+    UserPageSizeY = NULL;
     m_TextUserSizeY = NULL;
+    RightColumnSizer = NULL;
+    SheetInfoSizer = NULL;
     m_TextSheetCount = NULL;
     m_TextSheetNumber = NULL;
-    m_RevisionSizer = NULL;
+    RevisionSizer = NULL;
     m_TextRevision = NULL;
-    m_NameSizer = NULL;
+    TitleSizer = NULL;
     m_TextTitle = NULL;
-    m_CompanySizer = NULL;
+    CompanySizer = NULL;
     m_TextCompany = NULL;
-    m_Comment1Sizer = NULL;
+    Comment1Sizer = NULL;
     m_TextComment1 = NULL;
-    m_Comment2Sizer = NULL;
+    Comment2Sizer = NULL;
     m_TextComment2 = NULL;
-    m_Comment3Sizer = NULL;
+    Comment3Sizer = NULL;
     m_TextComment3 = NULL;
-    m_Comment4Sizer = NULL;
+    Comment4Sizer = NULL;
     m_TextComment4 = NULL;
-////@end WinEDA_SetPageFrame member initialisation
+    Line = NULL;
+    StdDialogButtonSizer = NULL;
+    Button_OK = NULL;
+    Button_Cancel = NULL;
 
-////@begin WinEDA_SetPageFrame creation
-    wxDialog::Create( parent, id, caption, pos, size, style );
+#ifdef EESCHEMA
+    m_RevisionExport = NULL;
+    m_TitleExport = NULL;
+    m_CompanyExport = NULL;
+    m_Comment1Export = NULL;
+    m_Comment2Export = NULL;
+    m_Comment3Export = NULL;
+    m_Comment4Export = NULL;
+#endif
 
-    CreateControls();
-    if (GetSizer())
-    {
-        GetSizer()->SetSizeHints(this);
-    }
-    Centre();
-////@end WinEDA_SetPageFrame creation
-    return true;
+////@end WinEDA_SetPageFrame member initialisation
 }
 
+
 /*!
  * Control creation for WinEDA_SetPageFrame
  */
 
 void WinEDA_SetPageFrame::CreateControls()
-{    
-	SetFont(*g_DialogFont);
-	
+{
+    SetFont( *g_DialogFont );
+
+// NOTE: The following code has been modified by providing the seven
+// checkboxes *only* within the EESchema version of this dialog box.
+
 ////@begin WinEDA_SetPageFrame content construction
-    // Generated by DialogBlocks, 11/01/2007 11:38:01 (unregistered)
+    // Generated by DialogBlocks, 13/11/2007 09:11:27 (unregistered)
 
     WinEDA_SetPageFrame* itemDialog1 = this;
 
     this->SetForegroundColour(wxColour(0, 128, 64));
-    wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxHORIZONTAL);
-    itemDialog1->SetSizer(itemBoxSizer2);
-
-    wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxALL, 5);
-
-    wxString m_PageSizeBoxStrings[] = {
-        _("Size A4"),
-        _("Size A3"),
-        _("Size A2"),
-        _("Size A1"),
-        _("Size A0"),
-        _("Size A"),
-        _("Size B"),
-        _("Size C"),
-        _("Size D"),
-        _("Size E"),
-        _("User size")
-    };
-    m_PageSizeBox = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Page Size:"), wxDefaultPosition, wxDefaultSize, 11, m_PageSizeBoxStrings, 1, wxRA_SPECIFY_COLS );
+    OuterSizer = new wxBoxSizer(wxVERTICAL);
+    itemDialog1->SetSizer(OuterSizer);
+
+    MainSizer = new wxBoxSizer(wxHORIZONTAL);
+    OuterSizer->Add(MainSizer, 1, wxGROW|wxRIGHT|wxTOP|wxBOTTOM, 5);
+
+    LeftColumnSizer = new wxFlexGridSizer(6, 1, 0, 0);
+    LeftColumnSizer->AddGrowableRow(1);
+    LeftColumnSizer->AddGrowableRow(2);
+    LeftColumnSizer->AddGrowableRow(3);
+    LeftColumnSizer->AddGrowableRow(4);
+    LeftColumnSizer->AddGrowableRow(5);
+    MainSizer->Add(LeftColumnSizer, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
+
+    wxArrayString m_PageSizeBoxStrings;
+    m_PageSizeBoxStrings.Add(_("Size A4"));
+    m_PageSizeBoxStrings.Add(_("Size A3"));
+    m_PageSizeBoxStrings.Add(_("Size A2"));
+    m_PageSizeBoxStrings.Add(_("Size A1"));
+    m_PageSizeBoxStrings.Add(_("Size A0"));
+    m_PageSizeBoxStrings.Add(_("Size A"));
+    m_PageSizeBoxStrings.Add(_("Size B"));
+    m_PageSizeBoxStrings.Add(_("Size C"));
+    m_PageSizeBoxStrings.Add(_("Size D"));
+    m_PageSizeBoxStrings.Add(_("Size E"));
+    m_PageSizeBoxStrings.Add(_("User size"));
+    m_PageSizeBox = new wxRadioBox( itemDialog1, ID_RADIOBOX_PAGE_SIZE, _("Page Size:"), wxDefaultPosition, wxDefaultSize, m_PageSizeBoxStrings, 1, wxRA_SPECIFY_COLS );
     m_PageSizeBox->SetSelection(0);
-    itemBoxSizer3->Add(m_PageSizeBox, 0, wxGROW|wxALL, 5);
+    LeftColumnSizer->Add(m_PageSizeBox, 1, wxGROW|wxALIGN_TOP|wxLEFT|wxRIGHT, 5);
+
+    UserSizeXSizer = new wxBoxSizer(wxVERTICAL);
+    LeftColumnSizer->Add(UserSizeXSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 5);
+
+    UserPageSizeX = new wxStaticText( itemDialog1, wxID_STATIC, _("User Page Size X: "), wxDefaultPosition, wxDefaultSize, 0 );
+    UserSizeXSizer->Add(UserPageSizeX, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 
-    wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("User Page Size X: "), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer3->Add(itemStaticText5, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    m_TextUserSizeX = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_USER_PAGE_SIZE_X, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
+    UserSizeXSizer->Add(m_TextUserSizeX, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT, 5);
 
-    m_TextUserSizeX = new wxTextCtrl( itemDialog1, ID_TEXTCTRL7, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer3->Add(m_TextUserSizeX, 0, wxALIGN_LEFT|wxALL, 5);
+    UserSizeYSizer = new wxBoxSizer(wxVERTICAL);
+    LeftColumnSizer->Add(UserSizeYSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 5);
 
-    wxStaticText* itemStaticText7 = new wxStaticText( itemDialog1, wxID_STATIC, _("User Page Size Y: "), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer3->Add(itemStaticText7, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    UserPageSizeY = new wxStaticText( itemDialog1, wxID_STATIC, _("User Page Size Y: "), wxDefaultPosition, wxDefaultSize, 0 );
+    UserSizeYSizer->Add(UserPageSizeY, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
 
-    m_TextUserSizeY = new wxTextCtrl( itemDialog1, ID_TEXTCTRL8, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer3->Add(m_TextUserSizeY, 0, wxALIGN_LEFT|wxALL, 5);
+    m_TextUserSizeY = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_USER_PAGE_SIZE_Y, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
+    UserSizeYSizer->Add(m_TextUserSizeY, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT, 5);
 
-    wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer2->Add(itemBoxSizer9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    LeftColumnSizer->Add(5, 10, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer9->Add(itemBoxSizer10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    LeftColumnSizer->Add(5, 10, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton11->SetDefault();
-    itemButton11->SetForegroundColour(wxColour(200, 0, 0));
-    itemBoxSizer10->Add(itemButton11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    LeftColumnSizer->Add(5, 10, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* itemButton12 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton12->SetForegroundColour(wxColour(0, 0, 255));
-    itemBoxSizer10->Add(itemButton12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    RightColumnSizer = new wxFlexGridSizer(8, 1, 0, 0);
+    RightColumnSizer->AddGrowableRow(0);
+    RightColumnSizer->AddGrowableRow(1);
+    RightColumnSizer->AddGrowableRow(2);
+    RightColumnSizer->AddGrowableRow(3);
+    RightColumnSizer->AddGrowableRow(4);
+    RightColumnSizer->AddGrowableRow(5);
+    RightColumnSizer->AddGrowableRow(6);
+    RightColumnSizer->AddGrowableRow(7);
+    RightColumnSizer->AddGrowableCol(0);
+    MainSizer->Add(RightColumnSizer, 1, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
 
-    wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer9->Add(itemBoxSizer13, 0, wxGROW|wxALL, 5);
+    SheetInfoSizer = new wxBoxSizer(wxHORIZONTAL);
+    RightColumnSizer->Add(SheetInfoSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
 
     m_TextSheetCount = new wxStaticText( itemDialog1, wxID_STATIC, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 );
     m_TextSheetCount->SetForegroundColour(wxColour(128, 0, 128));
-    itemBoxSizer13->Add(m_TextSheetCount, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
+    SheetInfoSizer->Add(m_TextSheetCount, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM|wxADJUST_MINSIZE, 5);
 
-    itemBoxSizer13->Add(5, 5, 0, wxGROW|wxALL, 5);
+    SheetInfoSizer->Add(5, 5, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
     m_TextSheetNumber = new wxStaticText( itemDialog1, wxID_STATIC, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 );
     m_TextSheetNumber->SetForegroundColour(wxColour(128, 0, 128));
-    itemBoxSizer13->Add(m_TextSheetNumber, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
+    SheetInfoSizer->Add(m_TextSheetNumber, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM|wxADJUST_MINSIZE, 5);
+
+    wxStaticBox* itemStaticBoxSizer20Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Revision:"));
+    RevisionSizer = new wxStaticBoxSizer(itemStaticBoxSizer20Static, wxHORIZONTAL);
+    itemStaticBoxSizer20Static->SetForegroundColour(wxColour(200, 0, 0));
+    RightColumnSizer->Add(RevisionSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
+
+    m_TextRevision = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_REVISION, _T(""), wxDefaultPosition, wxSize(100, -1), wxTE_RICH );
+    RevisionSizer->Add(m_TextRevision, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+
+#ifdef EESCHEMA
+    m_RevisionExport = new wxCheckBox( itemDialog1, ID_CHECKBOX_REVISION, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_RevisionExport->SetValue(false);
+    RevisionSizer->Add(m_RevisionExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+#endif
 
-    wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Revision:"));
-    m_RevisionSizer = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL);
-    itemStaticBoxSizer17Static->SetForegroundColour(wxColour(200, 0, 0));
-    itemBoxSizer9->Add(m_RevisionSizer, 0, wxGROW, 5);
+    wxStaticBox* itemStaticBoxSizer23Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Title:"));
+    TitleSizer = new wxStaticBoxSizer(itemStaticBoxSizer23Static, wxHORIZONTAL);
+    itemStaticBoxSizer23Static->SetForegroundColour(wxColour(200, 0, 0));
+    RightColumnSizer->Add(TitleSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5);
 
-    m_TextRevision = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxSize(100, -1), wxTE_RICH );
-    m_RevisionSizer->Add(m_TextRevision, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+    m_TextTitle = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_TITLE, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
+    TitleSizer->Add(m_TextTitle, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
-    wxStaticBox* itemStaticBoxSizer19Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Title:"));
-    m_NameSizer = new wxStaticBoxSizer(itemStaticBoxSizer19Static, wxHORIZONTAL);
-    itemStaticBoxSizer19Static->SetForegroundColour(wxColour(200, 0, 0));
-    itemBoxSizer9->Add(m_NameSizer, 0, wxALIGN_CENTER_HORIZONTAL, 5);
+#ifdef EESCHEMA
+    m_TitleExport = new wxCheckBox( itemDialog1, ID_CHECKBOX_TITLE, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_TitleExport->SetValue(false);
+    TitleSizer->Add(m_TitleExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+#endif
 
-    m_TextTitle = new wxTextCtrl( itemDialog1, ID_TEXTCTRL2, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
-    m_NameSizer->Add(m_TextTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticBox* itemStaticBoxSizer26Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Company:"));
+    CompanySizer = new wxStaticBoxSizer(itemStaticBoxSizer26Static, wxHORIZONTAL);
+    itemStaticBoxSizer26Static->SetForegroundColour(wxColour(200, 0, 0));
+    RightColumnSizer->Add(CompanySizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5);
 
-    wxStaticBox* itemStaticBoxSizer21Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Company:"));
-    m_CompanySizer = new wxStaticBoxSizer(itemStaticBoxSizer21Static, wxHORIZONTAL);
-    itemStaticBoxSizer21Static->SetForegroundColour(wxColour(200, 0, 0));
-    itemBoxSizer9->Add(m_CompanySizer, 0, wxGROW, 5);
+    m_TextCompany = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMPANY, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
+    CompanySizer->Add(m_TextCompany, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
-    m_TextCompany = new wxTextCtrl( itemDialog1, ID_TEXTCTRL1, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
-    m_CompanySizer->Add(m_TextCompany, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+#ifdef EESCHEMA
+    m_CompanyExport = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMPANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_CompanyExport->SetValue(false);
+    CompanySizer->Add(m_CompanyExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+#endif
 
-    wxStaticBox* itemStaticBoxSizer23Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment1:"));
-    m_Comment1Sizer = new wxStaticBoxSizer(itemStaticBoxSizer23Static, wxHORIZONTAL);
-    itemStaticBoxSizer23Static->SetForegroundColour(wxColour(196, 0, 100));
-    itemBoxSizer9->Add(m_Comment1Sizer, 0, wxGROW|wxADJUST_MINSIZE, 5);
+    wxStaticBox* itemStaticBoxSizer29Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment1:"));
+    Comment1Sizer = new wxStaticBoxSizer(itemStaticBoxSizer29Static, wxHORIZONTAL);
+    itemStaticBoxSizer29Static->SetForegroundColour(wxColour(196, 0, 100));
+    RightColumnSizer->Add(Comment1Sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5);
 
-    m_TextComment1 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL3, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
-    m_Comment1Sizer->Add(m_TextComment1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+    m_TextComment1 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMMENT1, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
+    Comment1Sizer->Add(m_TextComment1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
-    wxStaticBox* itemStaticBoxSizer25Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment2:"));
-    m_Comment2Sizer = new wxStaticBoxSizer(itemStaticBoxSizer25Static, wxHORIZONTAL);
-    itemStaticBoxSizer25Static->SetForegroundColour(wxColour(196, 0, 100));
-    itemBoxSizer9->Add(m_Comment2Sizer, 0, wxGROW|wxADJUST_MINSIZE, 5);
+#ifdef EESCHEMA
+    m_Comment1Export = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMENT1, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_Comment1Export->SetValue(false);
+    Comment1Sizer->Add(m_Comment1Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+#endif
 
-    m_TextComment2 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL4, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
-    m_Comment2Sizer->Add(m_TextComment2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+    wxStaticBox* itemStaticBoxSizer32Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment2:"));
+    Comment2Sizer = new wxStaticBoxSizer(itemStaticBoxSizer32Static, wxHORIZONTAL);
+    itemStaticBoxSizer32Static->SetForegroundColour(wxColour(196, 0, 100));
+    RightColumnSizer->Add(Comment2Sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5);
 
-    wxStaticBox* itemStaticBoxSizer27Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment3:"));
-    m_Comment3Sizer = new wxStaticBoxSizer(itemStaticBoxSizer27Static, wxHORIZONTAL);
-    itemStaticBoxSizer27Static->SetForegroundColour(wxColour(196, 0, 100));
-    itemBoxSizer9->Add(m_Comment3Sizer, 0, wxGROW|wxADJUST_MINSIZE, 5);
+    m_TextComment2 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMMENT2, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
+    Comment2Sizer->Add(m_TextComment2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
-    m_TextComment3 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL5, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
-    m_Comment3Sizer->Add(m_TextComment3, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+#ifdef EESCHEMA
+    m_Comment2Export = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMENT2, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_Comment2Export->SetValue(false);
+    Comment2Sizer->Add(m_Comment2Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+#endif
 
-    wxStaticBox* itemStaticBoxSizer29Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment4:"));
-    m_Comment4Sizer = new wxStaticBoxSizer(itemStaticBoxSizer29Static, wxHORIZONTAL);
-    itemStaticBoxSizer29Static->SetForegroundColour(wxColour(196, 0, 100));
-    itemBoxSizer9->Add(m_Comment4Sizer, 0, wxGROW|wxADJUST_MINSIZE, 5);
+    wxStaticBox* itemStaticBoxSizer35Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment3:"));
+    Comment3Sizer = new wxStaticBoxSizer(itemStaticBoxSizer35Static, wxHORIZONTAL);
+    itemStaticBoxSizer35Static->SetForegroundColour(wxColour(196, 0, 100));
+    RightColumnSizer->Add(Comment3Sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5);
+
+    m_TextComment3 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMMENT3, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
+    Comment3Sizer->Add(m_TextComment3, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+
+#ifdef EESCHEMA
+    m_Comment3Export = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMENT3, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_Comment3Export->SetValue(false);
+    Comment3Sizer->Add(m_Comment3Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+#endif
+
+    wxStaticBox* itemStaticBoxSizer38Static = new wxStaticBox(itemDialog1, wxID_STATIC, _("Comment4:"));
+    Comment4Sizer = new wxStaticBoxSizer(itemStaticBoxSizer38Static, wxHORIZONTAL);
+    itemStaticBoxSizer38Static->SetForegroundColour(wxColour(196, 0, 100));
+    RightColumnSizer->Add(Comment4Sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxADJUST_MINSIZE, 5);
+
+    m_TextComment4 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_COMMENT4, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
+    Comment4Sizer->Add(m_TextComment4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+
+#ifdef EESCHEMA
+    m_Comment4Export = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMENT4, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_Comment4Export->SetValue(false);
+    Comment4Sizer->Add(m_Comment4Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+#endif
+
+    Line = new wxStaticLine( itemDialog1, ID_STATICLINE, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    OuterSizer->Add(Line, 0, wxGROW|wxLEFT|wxRIGHT, 5);
+
+    StdDialogButtonSizer = new wxStdDialogButtonSizer;
+
+    OuterSizer->Add(StdDialogButtonSizer, 0, wxGROW|wxALL, 10);
+    Button_OK = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    Button_OK->SetForegroundColour(wxColour(200, 0, 0));
+    StdDialogButtonSizer->AddButton(Button_OK);
+
+    Button_Cancel = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    Button_Cancel->SetForegroundColour(wxColour(0, 0, 255));
+    StdDialogButtonSizer->AddButton(Button_Cancel);
+
+    StdDialogButtonSizer->Realize();
 
-    m_TextComment4 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL6, _T(""), wxDefaultPosition, wxSize(400, -1), 0 );
-    m_Comment4Sizer->Add(m_TextComment4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 
     // Set validators
     m_PageSizeBox->SetValidator( wxGenericValidator(& m_CurrentSelection) );
@@ -317,33 +460,40 @@ void WinEDA_SetPageFrame::CreateControls()
     m_TextComment3->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire3) );
     m_TextComment4->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire4) );
 ////@end WinEDA_SetPageFrame content construction
+}
 
-#ifdef EESCHEMA
-    m_RevisionExport = new wxCheckBox(this, -1,_("Export to other sheets"));
-    m_RevisionSizer->Add(m_RevisionExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxBOTTOM, 5);
-    m_TitleExport = new wxCheckBox(this, -1,_("Export to other sheets"));
-    m_NameSizer->Add(m_TitleExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxBOTTOM, 5);
-    m_CompanyExport = new wxCheckBox(this, -1,_("Export to other sheets"));
-    m_CompanySizer->Add(m_CompanyExport, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxBOTTOM, 5);
-    m_Comment1Export = new wxCheckBox(this, -1,_("Export to other sheets"));
-    m_Comment1Sizer->Add(m_Comment1Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxBOTTOM, 5);
-    m_Comment2Export = new wxCheckBox(this, -1,_("Export to other sheets"));
-    m_Comment2Sizer->Add(m_Comment2Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxBOTTOM, 5);
-    m_Comment3Export = new wxCheckBox(this, -1,_("Export to other sheets"));
-    m_Comment3Sizer->Add(m_Comment3Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxBOTTOM, 5);
-    m_Comment4Export = new wxCheckBox(this, -1,_("Export to other sheets"));
-    m_Comment4Sizer->Add(m_Comment4Export, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxBOTTOM, 5);
-#else
-	m_RevisionExport = NULL;
-	m_TitleExport = NULL;
-	m_CompanyExport = NULL;
-	m_Comment1Export = NULL;
-	m_Comment2Export = NULL;
-	m_Comment3Export = NULL;
-	m_Comment4Export = NULL;
-#endif
+
+/*!
+ * wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
+ */
+
+void WinEDA_SetPageFrame::OnCloseWindow( wxCloseEvent& event )
+{
+    EndModal( m_Modified );
+}
+
+
+/*!
+ * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
+ */
+
+void WinEDA_SetPageFrame::OnOkClick( wxCommandEvent& event )
+{
+    SavePageSettings( event );
+    Close( TRUE );
 }
 
+
+/*!
+ * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
+ */
+
+void WinEDA_SetPageFrame::OnCancelClick( wxCommandEvent& event )
+{
+    Close( TRUE );
+}
+
+
 /*!
  * Should we show tooltips?
  */
@@ -378,121 +528,117 @@ wxIcon WinEDA_SetPageFrame::GetIconResource( const wxString& name )
     return wxNullIcon;
 ////@end WinEDA_SetPageFrame icon retrieval
 }
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
- */
-
-void WinEDA_SetPageFrame::OnOkClick( wxCommandEvent& event )
-{
-	SavePageSettings(event);
-	Close(TRUE);
-}
-
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
- */
-
-void WinEDA_SetPageFrame::OnCancelClick( wxCommandEvent& event )
-{
-	Close(TRUE);
-}
 
 
 /*****************************************************************/
 void WinEDA_SetPageFrame::SavePageSettings(wxCommandEvent& event)
 /*****************************************************************/
 /* Mise a jour effective des textes et dimensions
-*/
+ */
 {
-double dtmp;
-wxString msg;
-	
-	m_Screen->m_Revision = m_TextRevision->GetValue();
-	m_Screen->m_Company = m_TextCompany->GetValue();
-	m_Screen->m_Title = m_TextTitle->GetValue();
-	m_Screen->m_Commentaire1 = m_TextComment1->GetValue();
-	m_Screen->m_Commentaire2 = m_TextComment2->GetValue();
-	m_Screen->m_Commentaire3 = m_TextComment3->GetValue();
-	m_Screen->m_Commentaire4 = m_TextComment4->GetValue();
-
-	msg = m_TextUserSizeX->GetValue();
-	msg.ToDouble(&dtmp); UserSizeX = dtmp;
-	msg = m_TextUserSizeY->GetValue();
-	msg.ToDouble(&dtmp); UserSizeY = dtmp;
-
-	int ii = m_PageSizeBox->GetSelection();
-	if ( ii < 0 ) ii = 0;
-	m_SelectedSheet = SheetList[ii];
-	m_Screen->m_CurrentSheet = m_SelectedSheet;
-
-	if ( g_UnitMetric )
-	{
-		g_Sheet_user.m_Size.x = (int)(UserSizeX * 1000 / 25.4 );
-		g_Sheet_user.m_Size.y = (int)(UserSizeY * 1000 / 25.4 );
-	}
-	else
-	{
-		g_Sheet_user.m_Size.x = (int)(UserSizeX * 1000 );
-		g_Sheet_user.m_Size.y = (int)(UserSizeY * 1000 );
-	}
-
-	if ( g_Sheet_user.m_Size.x < 6000 )g_Sheet_user.m_Size.x = 6000;
-	if ( g_Sheet_user.m_Size.x > 44000 )g_Sheet_user.m_Size.x = 44000;
-	if ( g_Sheet_user.m_Size.y < 4000 )g_Sheet_user.m_Size.y = 4000;
-	if ( g_Sheet_user.m_Size.y > 44000 )g_Sheet_user.m_Size.y = 44000;
+    double dtmp;
+    wxString msg;
+
+    m_Screen->m_Revision = m_TextRevision->GetValue();
+    m_Screen->m_Company = m_TextCompany->GetValue();
+    m_Screen->m_Title = m_TextTitle->GetValue();
+    m_Screen->m_Commentaire1 = m_TextComment1->GetValue();
+    m_Screen->m_Commentaire2 = m_TextComment2->GetValue();
+    m_Screen->m_Commentaire3 = m_TextComment3->GetValue();
+    m_Screen->m_Commentaire4 = m_TextComment4->GetValue();
+
+    msg = m_TextUserSizeX->GetValue();
+    msg.ToDouble(&dtmp);
+    UserSizeX = dtmp;
+    msg = m_TextUserSizeY->GetValue();
+    msg.ToDouble(&dtmp);
+    UserSizeY = dtmp;
+
+    int ii = m_PageSizeBox->GetSelection();
+
+    if( ii < 0 )
+        ii = 0;
+
+    m_SelectedSheet = SheetList[ii];
+    m_Screen->m_CurrentSheet = m_SelectedSheet;
+
+    if( g_UnitMetric )
+    {
+        g_Sheet_user.m_Size.x = (int)( UserSizeX * 1000 / 25.4 );
+        g_Sheet_user.m_Size.y = (int)( UserSizeY * 1000 / 25.4 );
+    }
+    else
+    {
+        g_Sheet_user.m_Size.x = (int)( UserSizeX * 1000 );
+        g_Sheet_user.m_Size.y = (int)( UserSizeY * 1000 );
+    }
+
+    if( g_Sheet_user.m_Size.x < 6000 )
+        g_Sheet_user.m_Size.x = 6000;
+
+    if( g_Sheet_user.m_Size.x > 44000 )
+        g_Sheet_user.m_Size.x = 44000;
+
+    if( g_Sheet_user.m_Size.y < 4000 )
+        g_Sheet_user.m_Size.y = 4000;
+
+    if( g_Sheet_user.m_Size.y > 44000 )
+        g_Sheet_user.m_Size.y = 44000;
 
 #ifdef EESCHEMA
-	/* Exports settings to other sheets if requested: */
-	SCH_SCREEN * screen;
-	/* Build the screen list */
-	EDA_ScreenList ScreenList(NULL);
-	/* Update the datas */
-	for ( screen = ScreenList.GetFirst(); screen != NULL; screen = ScreenList.GetNext() )
-	{
-		if (screen == m_Screen ) continue;
-		if ( m_RevisionExport->IsChecked() ) screen->m_Revision = m_Screen->m_Revision;
-		if ( m_TitleExport->IsChecked() ) screen->m_Title =m_Screen->m_Title; 
-		if ( m_CompanyExport->IsChecked() ) screen->m_Company = m_Screen->m_Company;
-		if ( m_Comment1Export->IsChecked() ) screen->m_Commentaire1 = m_Screen->m_Commentaire1;
-		if ( m_Comment2Export->IsChecked() ) screen->m_Commentaire2 = m_Screen->m_Commentaire2;
-		if ( m_Comment3Export->IsChecked() ) screen->m_Commentaire3 = m_Screen->m_Commentaire3;
-		if ( m_Comment4Export->IsChecked() ) screen->m_Commentaire4 = m_Screen->m_Commentaire4;
-	}
-	
+    /* Exports settings to other sheets if requested: */
+    SCH_SCREEN * screen;
+    /* Build the screen list */
+    EDA_ScreenList ScreenList(NULL);
+    /* Update the datas */
+    for( screen = ScreenList.GetFirst(); screen != NULL; screen = ScreenList.GetNext() )
+    {
+        if( screen == m_Screen )
+            continue;
+
+        if( m_RevisionExport->IsChecked() )
+            screen->m_Revision = m_Screen->m_Revision;
+
+        if( m_TitleExport->IsChecked() )
+            screen->m_Title =m_Screen->m_Title;
+
+        if( m_CompanyExport->IsChecked() )
+            screen->m_Company = m_Screen->m_Company;
+
+        if( m_Comment1Export->IsChecked() )
+            screen->m_Commentaire1 = m_Screen->m_Commentaire1;
+
+        if( m_Comment2Export->IsChecked() )
+            screen->m_Commentaire2 = m_Screen->m_Commentaire2;
+
+        if( m_Comment3Export->IsChecked() )
+            screen->m_Commentaire3 = m_Screen->m_Commentaire3;
+
+        if( m_Comment4Export->IsChecked() )
+            screen->m_Commentaire4 = m_Screen->m_Commentaire4;
+    }
 #endif
 
-	m_Screen->SetModify();
-	m_Screen->SetRefreshReq();
+    m_Screen->SetModify();
+    m_Screen->SetRefreshReq();
 }
 
 
-
 /*******************************************************/
 void WinEDA_SetPageFrame::SearchPageSizeSelection()
 /*******************************************************/
 /* Search the correct index to activate the radiobox list size selection
-	according to the current page size
-*/
-{
-Ki_PageDescr * sheet;
-int ii;
-	
-	m_CurrentSelection = NB_ITEMS-1;
-	for( ii = 0; ii < NB_ITEMS; ii++ )
-	{
-		sheet = SheetList[ii];
-		if( m_ParentDrawFrame->m_CurrentScreen->m_CurrentSheet == sheet )
-			m_CurrentSelection = ii;
-	}
-}
-
-/*!
- * wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
+ * according to the current page size
  */
-
-void WinEDA_SetPageFrame::OnCloseWindow( wxCloseEvent& event )
 {
-	EndModal(m_Modified);
-}
-
+    Ki_PageDescr * sheet;
+    int ii;
 
+    m_CurrentSelection = NB_ITEMS - 1;
+    for( ii = 0; ii < NB_ITEMS; ii++ )
+    {
+        sheet = SheetList[ii];
+        if( m_ParentDrawFrame->m_CurrentScreen->m_CurrentSheet == sheet )
+            m_CurrentSelection = ii;
+    }
+}

share/setpage.h

@@ -3,13 +3,23 @@
 // Purpose:     
 // Author:      jean-pierre Charras
 // Modified by: 
-// Created:     06/02/2006 20:53:09
+// Created:     13/11/2007 09:11:27
 // RCS-ID:      
 // Copyright:   License GNU
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
 
-// Generated by DialogBlocks (unregistered), 06/02/2006 20:53:09
+/* The "Page Settings" dialog box created by this file (and setpage.cpp)
+ * contains seven checkboxes which *are* provided when that dialog box is
+ * invoked in EESchema, but which are *not* provided when that dialog box is
+ * invoked in Pcbnew instead. As such, various lines within this file
+ * (and setpage.cpp) are included on an appropriately conditional basis.
+ * (That aspect should be noted if the contents of this file (and setpage.cpp)
+ * are ever consequently modified as a consequence of setpage.pjd being
+ * opened in DialogBlocks (as that file now incorporates those checkboxes).)
+ */
+
+// Generated by DialogBlocks (unregistered), 13/11/2007 09:11:27
 
 #ifndef _SETPAGE_H_
 #define _SETPAGE_H_
@@ -25,6 +35,7 @@
 ////@begin includes
 #include "wx/valgen.h"
 #include "wx/valtext.h"
+#include "wx/statline.h"
 ////@end includes
 
 /*!
@@ -32,34 +43,50 @@
  */
 
 ////@begin forward declarations
+class wxBoxSizer;
+class wxFlexGridSizer;
+class wxStaticLine;
+class wxStdDialogButtonSizer;
 ////@end forward declarations
 
 /*!
  * Control identifiers
  */
 
+// NOTE: The following code has been modified by listing the seven checkbox-
+// related definitions *only* within the EESchema version of this dialog box.
+
 ////@begin control identifiers
 #define ID_DIALOG 10000
-#define ID_RADIOBOX 10001
-#define ID_TEXTCTRL7 10009
-#define ID_TEXTCTRL8 10010
-#define ID_TEXTCTRL 10002
-#define ID_TEXTCTRL2 10004
-#define ID_TEXTCTRL1 10003
-#define ID_TEXTCTRL3 10005
-#define ID_TEXTCTRL4 10006
-#define ID_TEXTCTRL5 10007
-#define ID_TEXTCTRL6 10008
-#define SYMBOL_WINEDA_SETPAGEFRAME_STYLE wxDEFAULT_DIALOG_STYLE
+#define ID_RADIOBOX_PAGE_SIZE 10001
+#define ID_TEXTCTRL_USER_PAGE_SIZE_X 10002
+#define ID_TEXTCTRL_USER_PAGE_SIZE_Y 10003
+#define ID_TEXTCTRL_REVISION 10004
+#define ID_TEXTCTRL_TITLE 10005
+#define ID_TEXTCTRL_COMPANY 10006
+#define ID_TEXTCTRL_COMMENT1 10007
+#define ID_TEXTCTRL_COMMENT2 10008
+#define ID_TEXTCTRL_COMMENT3 10009
+#define ID_TEXTCTRL_COMMENT4 10010
+
+#ifdef EESCHEMA
+#define ID_CHECKBOX_REVISION 10011
+#define ID_CHECKBOX_TITLE 10012
+#define ID_CHECKBOX_COMPANY 10013
+#define ID_CHECKBOX_COMMENT1 10014
+#define ID_CHECKBOX_COMMENT2 10015
+#define ID_CHECKBOX_COMMENT3 10016
+#define ID_CHECKBOX_COMMENT4 10017
+#endif
+
+#define ID_STATICLINE 10018
+#define SYMBOL_WINEDA_SETPAGEFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER
 #define SYMBOL_WINEDA_SETPAGEFRAME_TITLE _("Page Settings")
 #define SYMBOL_WINEDA_SETPAGEFRAME_IDNAME ID_DIALOG
 #define SYMBOL_WINEDA_SETPAGEFRAME_SIZE wxSize(400, 300)
 #define SYMBOL_WINEDA_SETPAGEFRAME_POSITION wxDefaultPosition
 ////@end control identifiers
 
-/*!
- * Compatibility
- */
 
 /*!
  * WinEDA_SetPageFrame class declaration
@@ -74,24 +101,29 @@ public:
     /// Constructors
     WinEDA_SetPageFrame( );
     WinEDA_SetPageFrame( WinEDA_DrawFrame* parent,
-				wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME,
-				const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE,
-				const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION,
-				const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE,
-				long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE );
+                         wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME,
+                         const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE,
+                         const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION,
+                         const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE,
+                         long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE );
 
     /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME, 
-		const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE,
-		const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION,
-		const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE,
-		long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE );
+    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_SETPAGEFRAME_IDNAME,
+                 const wxString& caption = SYMBOL_WINEDA_SETPAGEFRAME_TITLE,
+                 const wxPoint& pos = SYMBOL_WINEDA_SETPAGEFRAME_POSITION,
+                 const wxSize& size = SYMBOL_WINEDA_SETPAGEFRAME_SIZE,
+                 long style = SYMBOL_WINEDA_SETPAGEFRAME_STYLE );
+
+    /// Destructor
+    ~WinEDA_SetPageFrame();
+
+    /// Initialises member variables
+    void Init();
 
     /// Creates the controls and sizers
     void CreateControls();
 
 ////@begin WinEDA_SetPageFrame event handler declarations
-
     /// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
     void OnCloseWindow( wxCloseEvent& event );
 
@@ -104,7 +136,6 @@ public:
 ////@end WinEDA_SetPageFrame event handler declarations
 
 ////@begin WinEDA_SetPageFrame member function declarations
-
     /// Retrieves bitmap resources
     wxBitmap GetBitmapResource( const wxString& name );
 
@@ -115,45 +146,65 @@ public:
     /// Should we show tooltips?
     static bool ShowToolTips();
 
-	void SearchPageSizeSelection();
-	void SavePageSettings(wxCommandEvent& event);
-	void ReturnSizeSelected(wxCommandEvent& event);
+    void SearchPageSizeSelection();
+    void SavePageSettings(wxCommandEvent& event);
+    void ReturnSizeSelected(wxCommandEvent& event);
+
+// NOTE: The following code has been modified by listing the seven
+// checkboxes *only* within the EESchema version of this dialog box.
 
 ////@begin WinEDA_SetPageFrame member variables
+    wxBoxSizer* OuterSizer;
+    wxBoxSizer* MainSizer;
+    wxFlexGridSizer* LeftColumnSizer;
     wxRadioBox* m_PageSizeBox;
+    wxBoxSizer* UserSizeXSizer;
+    wxStaticText* UserPageSizeX;
     wxTextCtrl* m_TextUserSizeX;
+    wxBoxSizer* UserSizeYSizer;
+    wxStaticText* UserPageSizeY;
     wxTextCtrl* m_TextUserSizeY;
+    wxFlexGridSizer* RightColumnSizer;
+    wxBoxSizer* SheetInfoSizer;
     wxStaticText* m_TextSheetCount;
     wxStaticText* m_TextSheetNumber;
-    wxStaticBoxSizer* m_RevisionSizer;
+    wxStaticBoxSizer* RevisionSizer;
     wxTextCtrl* m_TextRevision;
-    wxStaticBoxSizer* m_NameSizer;
+    wxStaticBoxSizer* TitleSizer;
     wxTextCtrl* m_TextTitle;
-    wxStaticBoxSizer* m_CompanySizer;
+    wxStaticBoxSizer* CompanySizer;
     wxTextCtrl* m_TextCompany;
-    wxStaticBoxSizer* m_Comment1Sizer;
+    wxStaticBoxSizer* Comment1Sizer;
     wxTextCtrl* m_TextComment1;
-    wxStaticBoxSizer* m_Comment2Sizer;
+    wxStaticBoxSizer* Comment2Sizer;
     wxTextCtrl* m_TextComment2;
-    wxStaticBoxSizer* m_Comment3Sizer;
+    wxStaticBoxSizer* Comment3Sizer;
     wxTextCtrl* m_TextComment3;
-    wxStaticBoxSizer* m_Comment4Sizer;
+    wxStaticBoxSizer* Comment4Sizer;
     wxTextCtrl* m_TextComment4;
+    wxStaticLine* Line;
+    wxStdDialogButtonSizer* StdDialogButtonSizer;
+    wxButton* Button_OK;
+    wxButton* Button_Cancel;
+
+#ifdef EESCHEMA
+    wxCheckBox* m_RevisionExport;
+    wxCheckBox* m_TitleExport;
+    wxCheckBox* m_CompanyExport;
+    wxCheckBox* m_Comment1Export;
+    wxCheckBox* m_Comment2Export;
+    wxCheckBox* m_Comment3Export;
+    wxCheckBox* m_Comment4Export;
+#endif
+
 ////@end WinEDA_SetPageFrame member variables
-    wxCheckBox * m_RevisionExport;
-   wxCheckBox * m_TitleExport;
-   wxCheckBox * m_CompanyExport;
-   wxCheckBox * m_Comment1Export;
-   wxCheckBox * m_Comment2Export;
-   wxCheckBox * m_Comment3Export;
-   wxCheckBox * m_Comment4Export;
-
-	WinEDA_DrawFrame *m_ParentDrawFrame;
-	BASE_SCREEN * m_Screen;
-	int m_Modified;
-	Ki_PageDescr * m_SelectedSheet;
-	float UserSizeX, UserSizeY;
-	int m_CurrentSelection;
+
+    WinEDA_DrawFrame *m_ParentDrawFrame;
+    BASE_SCREEN * m_Screen;
+    int m_Modified;
+    Ki_PageDescr * m_SelectedSheet;
+    float UserSizeX, UserSizeY;
+    int m_CurrentSelection;
 };
 
 #endif