remove unused files. some translations.

cvpcb: set flag wxFRAME_FLOAT_ON_PARENT when create the footprint 3D frame and the display frame

remove unused files. some translations.
cvpcb: set flag wxFRAME_FLOAT_ON_PARENT when create the footprint 3D frame and the display frame
ec02baab · CHARRAS · a95237d8 · ec02baab · ec02baab · ec02baab
Commit ec02baab authored Oct 27, 2007 by CHARRAS
38 changed files
--- a/3d-viewer/3d_frame.cpp
+++ b/3d-viewer/3d_frame.cpp
@@ -38,9 +38,9 @@ END_EVENT_TABLE()
 /*******************************************************************/
 WinEDA3D_DrawFrame::WinEDA3D_DrawFrame(WinEDA_BasePcbFrame * parent,
-		WinEDA_App *app_parent, const wxString& title ):
+		WinEDA_App *app_parent, const wxString& title, long style ):
 	wxFrame(parent, DISPLAY3D_FRAME, title,
-		wxPoint(-1,-1), wxSize(-1,-1) )
+		wxPoint(-1,-1), wxSize(-1,-1), style )
 /*******************************************************************/
 {
 	m_FrameName = wxT("Frame3D");

--- a/3d-viewer/3d_viewer.h
+++ b/3d-viewer/3d_viewer.h
@@ -29,6 +29,9 @@
 #include "pcbstruct.h"
 #include "3d_struct.h"
+#define KICAD_DEFAULT_3D_DRAWFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxWANTS_CHARS
 #define LIB3D_PATH wxT("packages3d/")
 class Pcb3D_GLCanvas;
@@ -124,11 +127,10 @@ public:
 private:
 	wxString m_FrameName;		// name used for writting and reading setup
 								// It is "Frame3D"
 public:
 	WinEDA3D_DrawFrame(WinEDA_BasePcbFrame * parent, WinEDA_App *app_parent,
-		const wxString& title );
+		const wxString& title, long style = KICAD_DEFAULT_3D_DRAWFRAME_STYLE );
    void Exit3DFrame(wxCommandEvent& event);
 	void OnCloseWindow(wxCloseEvent & Event);

--- a/change_log.txt
+++ b/change_log.txt
@@ -4,6 +4,19 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
+2007-Oct-27 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
+================================================================================
+ all:
+	remove unused files.
+	some translations
+cvpcb:
+	set flag wxFRAME_FLOAT_ON_PARENT when create the footprint 3D frame and the
+	display frame
+	minor other changes
 2007-Oct-26 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 + pcbnew:

--- a/common/basicframe.cpp
+++ b/common/basicframe.cpp
@@ -18,9 +18,8 @@
 WinEDA_BasicFrame::WinEDA_BasicFrame( wxWindow * father, int idtype,
 						WinEDA_App *parent, const wxString & title,
-						const wxPoint& pos, const wxSize& size):
+						const wxPoint& pos, const wxSize& size, long style):
-		wxFrame(father, -1, title, pos, size,
+		wxFrame(father, -1, title, pos, size, style )
-			wxDEFAULT_FRAME_STYLE|wxWANTS_CHARS)
 {
 wxSize minsize;

--- a/common/svg_print.h.notused
+++ b/common/svg_print.h.notused
 /////////////////////////////////////////////////////////////////////////////
 // Name:        svg_print.h
 // Purpose:     
 // Author:      jean-pierre Charras
 // Modified by: 
-// Created:     05/02/2006 11:05:20
+// Created:     27/10/2007 12:48:35
 // RCS-ID:      
 // Copyright:   License GNU
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
-// Generated by DialogBlocks (unregistered), 05/02/2006 11:05:20
+// Generated by DialogBlocks (unregistered), 27/10/2007 12:48:35
 #ifndef _SVG_PRINT_H_
 #define _SVG_PRINT_H_
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "svg_print.h"
 #endif
 /*!
 * Includes
 */
 ////@begin includes
 #include "wx/valgen.h"
 #include "wx/spinctrl.h"
 ////@end includes
 /*!
 * Forward declarations
 */
 ////@begin forward declarations
 class wxSpinCtrl;
 ////@end forward declarations
 /*!
 * Control identifiers
 */
 ////@begin control identifiers
 #define ID_DIALOG 10000
-#define SYMBOL_WINEDA_PRINTSVGFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX|wxFRAME_FLOAT_ON_PARENT
+#define ID_SPINCTRL 10003
-#define SYMBOL_WINEDA_PRINTSVGFRAME_TITLE _("Create SVG file")
+#define ID_RADIOBOX_SETPRINTMODE 10007
-#define SYMBOL_WINEDA_PRINTSVGFRAME_IDNAME ID_DIALOG
+#define ID_CHECKBOX 10004
-#define SYMBOL_WINEDA_PRINTSVGFRAME_SIZE wxSize(400, 300)
+#define ID_RADIOBOX 10005
-#define SYMBOL_WINEDA_PRINTSVGFRAME_POSITION wxDefaultPosition
+#define ID_PRINT_EXECUTE 10002
-#define ID_SPINCTRL 10003
+#define ID_TEXTCTRL 10001
-#define ID_RADIOBOX_SETPRINTMODE 10007
+#define ID_TEXTCTRL1 10006
-#define ID_CHECKBOX 10004
+#define SYMBOL_WINEDA_PRINTSVGFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|wxFRAME_FLOAT_ON_PARENT|MAYBE_RESIZE_BORDER
-#define ID_RADIOBOX 10005
+#define SYMBOL_WINEDA_PRINTSVGFRAME_TITLE _("Create SVG file")
-#define ID_PRINT_EXECUTE 10002
+#define SYMBOL_WINEDA_PRINTSVGFRAME_IDNAME ID_DIALOG
-#define ID_TEXTCTRL 10001
+#define SYMBOL_WINEDA_PRINTSVGFRAME_SIZE wxSize(400, 300)
-#define ID_TEXTCTRL1 10006
+#define SYMBOL_WINEDA_PRINTSVGFRAME_POSITION wxDefaultPosition
 ////@end control identifiers
-/*!
- * Compatibility
+/*!
- */
+ * WinEDA_PrintSVGFrame class declaration
+ */
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
+class WinEDA_PrintSVGFrame: public wxDialog
-#endif
+{    
+    DECLARE_DYNAMIC_CLASS( WinEDA_PrintSVGFrame )
-/*!
+    DECLARE_EVENT_TABLE()
- * WinEDA_PrintSVGFrame class declaration
- */
+public:
+    /// Constructors
-class WinEDA_PrintSVGFrame: public wxDialog
+    WinEDA_PrintSVGFrame();
-{    
+    WinEDA_PrintSVGFrame( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_PRINTSVGFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_PRINTSVGFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PRINTSVGFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_PRINTSVGFRAME_SIZE, long style = SYMBOL_WINEDA_PRINTSVGFRAME_STYLE );
-    DECLARE_DYNAMIC_CLASS( WinEDA_PrintSVGFrame )
-    DECLARE_EVENT_TABLE()
+    /// Creation
+    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_PRINTSVGFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_PRINTSVGFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PRINTSVGFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_PRINTSVGFRAME_SIZE, long style = SYMBOL_WINEDA_PRINTSVGFRAME_STYLE );
-public:
-    /// Constructors
+    /// Destructor
-    WinEDA_PrintSVGFrame( );
+    ~WinEDA_PrintSVGFrame();
-    WinEDA_PrintSVGFrame( WinEDA_DrawFrame* parent,
-			wxWindowID id = SYMBOL_WINEDA_PRINTSVGFRAME_IDNAME,
+    /// Initialises member variables
-			const wxString& caption = SYMBOL_WINEDA_PRINTSVGFRAME_TITLE,
+    void Init();
-			const wxPoint& pos = SYMBOL_WINEDA_PRINTSVGFRAME_POSITION,
-			const wxSize& size = SYMBOL_WINEDA_PRINTSVGFRAME_SIZE,
+    /// Creates the controls and sizers
-			long style = SYMBOL_WINEDA_PRINTSVGFRAME_STYLE );
+    void CreateControls();
-    /// Creation
+////@begin WinEDA_PrintSVGFrame event handler declarations
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_PRINTSVGFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_PRINTSVGFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PRINTSVGFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_PRINTSVGFRAME_SIZE, long style = SYMBOL_WINEDA_PRINTSVGFRAME_STYLE );
+    /// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
+    void OnCloseWindow( wxCloseEvent& event );
-    /// Creates the controls and sizers
-    void CreateControls();
+    /// wxEVT_COMMAND_SPINCTRL_UPDATED event handler for ID_SPINCTRL
+    void OnSpinctrlUpdated( wxSpinEvent& event );
-////@begin WinEDA_PrintSVGFrame event handler declarations
+    /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_RADIOBOX_SETPRINTMODE
-    /// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
+    void OnRadioboxSetprintmodeSelected( wxCommandEvent& event );
-    void OnCloseWindow( wxCloseEvent& event );
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_PRINT_EXECUTE
-    /// wxEVT_COMMAND_SPINCTRL_UPDATED event handler for ID_SPINCTRL
+    void OnPrintExecuteClick( wxCommandEvent& event );
-    void OnSpinctrlUpdated( wxSpinEvent& event );
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
-    /// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for ID_RADIOBOX_SETPRINTMODE
+    void OnCloseClick( wxCommandEvent& event );
-    void OnRadioboxSetprintmodeSelected( wxCommandEvent& event );
+////@end WinEDA_PrintSVGFrame event handler declarations
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_PRINT_EXECUTE
-    void OnPrintExecuteClick( wxCommandEvent& event );
+////@begin WinEDA_PrintSVGFrame member function declarations
+    /// Retrieves bitmap resources
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
+    wxBitmap GetBitmapResource( const wxString& name );
-    void OnCloseClick( wxCommandEvent& event );
+    /// Retrieves icon resources
-////@end WinEDA_PrintSVGFrame event handler declarations
+    wxIcon GetIconResource( const wxString& name );
+////@end WinEDA_PrintSVGFrame member function declarations
-////@begin WinEDA_PrintSVGFrame member function declarations
+    /// Should we show tooltips?
-    /// Retrieves bitmap resources
+    static bool ShowToolTips();
-    wxBitmap GetBitmapResource( const wxString& name );
+////@begin WinEDA_PrintSVGFrame member variables
-    /// Retrieves icon resources
+    wxSpinCtrl* m_ButtPenWidth;
-    wxIcon GetIconResource( const wxString& name );
+    wxRadioBox* m_ModeColorOption;
-////@end WinEDA_PrintSVGFrame member function declarations
+    wxCheckBox* m_Print_Sheet_Ref;
+    wxRadioBox* m_PagesOption;
-    /// Should we show tooltips?
+    wxTextCtrl* m_FileNameCtrl;
-    static bool ShowToolTips();
+    wxTextCtrl* m_MessagesBox;
+////@end WinEDA_PrintSVGFrame member variables
-	void PrintSVGDoc(wxCommandEvent& event);
+};
-	bool DrawPage(const wxString & FullFileName);
-	void SetPenWidth(wxSpinEvent& event);
+#endif
-	wxString ReturnFullFileName();
+    // _SVG_PRINT_H_
-////@begin WinEDA_PrintSVGFrame member variables
-    wxSpinCtrl* m_ButtPenWidth;
-    wxRadioBox* m_ModeColorOption;
-    wxCheckBox* m_Print_Sheet_Ref;
-    wxRadioBox* m_PagesOption;
-    wxTextCtrl* m_FileNameCtrl;
-    wxTextCtrl* m_MessagesBox;
-////@end WinEDA_PrintSVGFrame member variables
-	WinEDA_DrawFrame * m_Parent;
-	int m_PrintMaskLayer;
-	int m_ImageXSize_mm;
-};
-#endif
-    // _SVG_PRINT_H_
--- a/cvpcb/affiche.cpp.notused
+++ b/cvpcb/affiche.cpp.notused
-		/**********************************************************/
-		/* Routines d'affichage de parametres et caracteristiques */
-		/**********************************************************/
-		/* Fichier AFFICHE.CC */
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "menu.h"
-#include "pcbnew.h"
-#include "cvpcb.h"
-#include "3d_struct.h"
-#include "protos.h"
--- a/cvpcb/cvframe.cpp
+++ b/cvpcb/cvframe.cpp
@@ -21,8 +21,8 @@
 	/*******************************************************/
 	/* Constructeur de WinEDA_CvpcbFrame: la fenetre generale */
 	/*******************************************************/
-WinEDA_CvpcbFrame::WinEDA_CvpcbFrame(WinEDA_App *parent, const wxString & title ):
+WinEDA_CvpcbFrame::WinEDA_CvpcbFrame(WinEDA_App *parent, const wxString & title, long style ):
-		WinEDA_BasicFrame(NULL, CVPCB_FRAME, parent, title, wxDefaultPosition, wxDefaultSize )
+		WinEDA_BasicFrame(NULL, CVPCB_FRAME, parent, title, wxDefaultPosition, wxDefaultSize, style )
 {
 	m_FrameName = wxT("CvpcbFrame");
 	m_ListCmp = NULL;

--- a/cvpcb/cvpcb.h
+++ b/cvpcb/cvpcb.h
-	/**********************************************/
+/**********************************************/
-	/* CVPCB : declaration des variables globales */
+/* CVPCB : declaration des variables globales */
-	/**********************************************/
+/**********************************************/
 #ifndef eda_global
@@ -15,140 +15,139 @@
 #include "colors.h"
 // Define print format d to display a schematic component line
-#define CMP_FORMAT wxT("%3d %8s - %16s : %-.32s")
+#define CMP_FORMAT wxT( "%3d %8s - %16s : %-.32s" )
 #define FILTERFOOTPRINTKEY "FilterFootprint"
-enum TypeOfStruct
+enum TypeOfStruct {
-	{
+    STRUCT_NOT_INIT,
-	STRUCT_NOT_INIT,
+    STRUCT_COMPONENT,
-	STRUCT_COMPONENT,
+    STRUCT_PIN,
-	STRUCT_PIN,
+    STRUCT_MODULE,
-	STRUCT_MODULE,
+    STRUCT_PSEUDOMODULE
-	STRUCT_PSEUDOMODULE
+};
-	};
 class STOREPIN
 {
 public:
-	int m_Type;				/* Type de la structure */
+    int       m_Type;           /* Type de la structure */
-	STOREPIN * Pnext;		/* Chainage avant */
+    STOREPIN* Pnext;            /* Chainage avant */
-	int m_Index;				/* variable utilisee selon types de netlistes */
+    int       m_Index;          /* variable utilisee selon types de netlistes */
-	int m_PinType;			/* code type electrique ( Entree Sortie Passive..) */
+    int       m_PinType;        /* code type electrique ( Entree Sortie Passive..) */
-	wxString m_PinNet;			/* Pointeur sur le texte nom de net */
+    wxString  m_PinNet;         /* Pointeur sur le texte nom de net */
-	wxString m_PinNum;
+    wxString  m_PinNum;
-	wxString m_PinName;
+    wxString  m_PinName;
-	wxString m_Repere;		/* utilise selon formats de netliste */
+    wxString  m_Repere;     /* utilise selon formats de netliste */
-	STOREPIN();
+    STOREPIN();
-} ;
+};
 class STORECMP
 {
 public:
-	int m_Type;				/* Type de la structure */
+    int           m_Type;       /* Type de la structure */
-	STORECMP * Pnext;		/* Chainage avant */
+    STORECMP*     Pnext;        /* Chainage avant */
-	STORECMP * Pback;		/* Chainage arriere */
+    STORECMP*     Pback;        /* Chainage arriere */
-	int m_Num;				/* Numero d'ordre */
+    int           m_Num;        /* Numero d'ordre */
-	int m_Multi;				/* Nombre d' unites par boitier */
+    int           m_Multi;      /* Nombre d' unites par boitier */
-	STOREPIN * m_Pins;		/* pointeur sur la liste des Pins */
+    STOREPIN*     m_Pins;       /* pointeur sur la liste des Pins */
-	wxString m_Reference;		/* U3, R5  ... */
+    wxString      m_Reference;  /* U3, R5  ... */
-	wxString m_Valeur;		/* 7400, 47K ... */
+    wxString      m_Valeur;     /* 7400, 47K ... */
-	wxString m_TimeStamp;		/* Signature temporelle ("00000000" si absente) */
+    wxString      m_TimeStamp;  /* Signature temporelle ("00000000" si absente) */
-	wxString m_Module;		/* Nom du module (Package) corresp */
+    wxString      m_Module;     /* Nom du module (Package) corresp */
-	wxString m_Repere;		/* utilise selon formats de netliste */
+    wxString      m_Repere;     /* utilise selon formats de netliste */
-	wxArrayString m_FootprintFilter;	/* List of allowed footprints (wildcart allowed
+    wxArrayString m_FootprintFilter;    /* List of allowed footprints (wildcart allowed
-							if void: no filtering */
+                                          * if void: no filtering */
-	STORECMP();
+    STORECMP();
-	~STORECMP();
+    ~STORECMP();
-} ;
+};
 class STOREMOD
 {
 public:
-	int m_Type;				/* Type de la structure */
+    int       m_Type;       /* Type de la structure */
-	STOREMOD * Pnext;		/* Chainage avant */
+    STOREMOD* Pnext;        /* Chainage avant */
-	STOREMOD * Pback;		/* Chainage arriere */
+    STOREMOD* Pback;        /* Chainage arriere */
-	wxString m_Module;		/* Nom du module */
+    wxString  m_Module;     /* Nom du module */
-	wxString m_LibName;		/* Nom de la librairie contenant ce module */
+    wxString  m_LibName;    /* Nom de la librairie contenant ce module */
-	int m_Num ;				/* Numero d'ordre pour affichage sur la liste */
+    int       m_Num;        /* Numero d'ordre pour affichage sur la liste */
-	wxString m_Doc;			/* Doc associee */
+    wxString  m_Doc;        /* Doc associee */
-	wxString m_KeyWord;		/* Mots cles associes */
+    wxString  m_KeyWord;    /* Mots cles associes */
-	STOREMOD();
+    STOREMOD();
 };
-eda_global STOREMOD * g_BaseListePkg;
+eda_global STOREMOD* g_BaseListePkg;
-eda_global STORECMP * g_BaseListeCmp;
+eda_global STORECMP* g_BaseListeCmp;
-eda_global FILE *source ;
+eda_global FILE*     source;
-eda_global FILE *dest	;
+eda_global FILE*     dest;
-eda_global FILE *libcmp ;
+eda_global FILE*     libcmp;
-eda_global FILE *lib_module ;
+eda_global FILE*     lib_module;
 /* nom des fichiers a traiter */
-eda_global wxString FFileName;
+eda_global wxString  FFileName;
 /* Types de netliste: */
-#define TYPE_NON_SPECIFIE 0
+#define TYPE_NON_SPECIFIE  0
-#define TYPE_ORCADPCB2 1
+#define TYPE_ORCADPCB2     1
-#define TYPE_PCAD 2
+#define TYPE_PCAD          2
 #define TYPE_VIEWLOGIC_WIR 3
 #define TYPE_VIEWLOGIC_NET 4
 /* Gestion des noms des librairies */
 eda_global wxString g_EquivExtBuffer
 #ifdef MAIN
-( wxT(".equ") )
+( wxT( ".equ" ) )
 #endif
 ;
 eda_global wxString g_ExtCmpBuffer
 #ifdef MAIN
- ( wxT(".cmp") )
+( wxT( ".cmp" ) )
 #endif
 ;
-eda_global wxString g_UserNetDirBuffer;	// Netlist path (void = current working directory)
+eda_global wxString      g_UserNetDirBuffer;    // Netlist path (void = current working directory)
-eda_global wxArrayString g_ListName_Equ;	// list of .equ files to load
+eda_global wxArrayString g_ListName_Equ;        // list of .equ files to load
-eda_global int g_FlagEESchema;
+eda_global int           g_FlagEESchema;
-eda_global int Rjustify;		/* flag pout troncature des noms de Net:
+eda_global int           Rjustify; /* flag pout troncature des noms de Net:
-							= 0: debut de chaine conservee (->ORCADPCB2)
+                                  * = 0: debut de chaine conservee (->ORCADPCB2)
-							= 1: fin de chaine conservee (->VIEWLOGIC) */
+                                  * = 1: fin de chaine conservee (->VIEWLOGIC) */
-eda_global int selection_type;	/* 0 pour sel par U??, 1 pour sel par ref ORCADPCB */
+eda_global int           selection_type;    /* 0 pour sel par U??, 1 pour sel par ref ORCADPCB */
-eda_global int modified;		/* Flag != 0 si modif attribution des modules */
+eda_global int           modified;          /* Flag != 0 si modif attribution des modules */
-eda_global int ListModIsModified;		/* Flag != 0 si modif liste des lib modules */
+eda_global int           ListModIsModified; /* Flag != 0 si modif liste des lib modules */
-eda_global char alim[1024];
+eda_global char          alim[1024];
-eda_global int nbcomp ;					/* nombre de composants trouves */
+eda_global int           nbcomp;                    /* nombre de composants trouves */
-eda_global int nblib  ;					/* nombre d'empreintes trouvees */
+eda_global int           nblib;                     /* nombre d'empreintes trouvees */
-eda_global int composants_non_affectes ;/* nbre de composants non affectes */
+eda_global int           composants_non_affectes;   /* nbre de composants non affectes */
-eda_global wxString NameBuffer;
+eda_global wxString      NameBuffer;
-eda_global wxString NetInNameBuffer;
+eda_global wxString      NetInNameBuffer;
-eda_global wxString NetInExtBuffer;
+eda_global wxString      NetInExtBuffer;
-eda_global wxString PkgInExtBuffer;
+eda_global wxString      PkgInExtBuffer;
-eda_global wxString NetDirBuffer;
+eda_global wxString      NetDirBuffer;
-eda_global wxString ExtRetroBuffer
+eda_global wxString      ExtRetroBuffer
 #ifdef MAIN
- ( wxT(".stf") )
+( wxT( ".stf" ) )
 #endif
 ;
 // Variables generales */
 // Unused, for pcbnew compatibility:
-eda_global Ki_PageDescr * SheetList[]
+eda_global Ki_PageDescr* SheetList[]
 #ifdef MAIN
-= {NULL}
+= { NULL }
 #endif
 ;
 // Unused, for pcbnew compatibility:
-void Plume(int state);
+void Plume( int state );
--- a/cvpcb/cvstruct.h
+++ b/cvpcb/cvstruct.h
@@ -39,7 +39,8 @@ private:
 	// Constructor and destructor
 public:
-	WinEDA_CvpcbFrame(WinEDA_App * parent, const wxString & title);
+	WinEDA_CvpcbFrame(WinEDA_App * parent, const wxString & title,
+					  long style = KICAD_DEFAULT_DRAWFRAME_STYLE);
 	~WinEDA_CvpcbFrame();
 	void OnLeftClick(wxListEvent & event);
@@ -180,7 +181,8 @@ public:
 public:
 	WinEDA_DisplayFrame( wxWindow * father, WinEDA_App *parent,
 					const wxString & title,
-					const wxPoint& pos, const wxSize& size);
+					const wxPoint& pos, const wxSize& size,
+					long style = KICAD_DEFAULT_DRAWFRAME_STYLE);
 	~WinEDA_DisplayFrame();
@@ -194,6 +196,7 @@ public:
 	void OnLeftDClick(wxDC * DC, const wxPoint& MousePos);
 	bool OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu);
 	void SetToolbars();
+	void GeneralControle( wxDC* DC, wxPoint Mouse );
 	void InstallOptionsDisplay(wxCommandEvent& event);
 	MODULE * Get_Module(const wxString & CmpName);

--- a/cvpcb/dialog_cvpcb_config.cpp
+++ b/cvpcb/dialog_cvpcb_config.cpp
@@ -96,12 +96,14 @@ bool KiConfigCvpcbFrame::Create( wxWindow* parent, wxWindowID id, const wxString
 ////@end KiConfigCvpcbFrame member initialisation
 ////@begin KiConfigCvpcbFrame creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
+    SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
    wxDialog::Create( parent, id, caption, pos, size, style );
    CreateControls();
-    GetSizer()->Fit(this);
+    if (GetSizer())
-    GetSizer()->SetSizeHints(this);
+    {
+        GetSizer()->SetSizeHints(this);
+    }
    Centre();
 ////@end KiConfigCvpcbFrame creation
    return true;
@@ -116,7 +118,7 @@ void KiConfigCvpcbFrame::CreateControls()
 	SetFont(*g_DialogFont);
 ////@begin KiConfigCvpcbFrame content construction
-    // Generated by DialogBlocks, 28/02/2006 16:11:39 (unregistered)
+    // Generated by DialogBlocks, 27/10/2007 10:35:43 (unregistered)
    KiConfigCvpcbFrame* itemDialog1 = this;
@@ -128,7 +130,7 @@ void KiConfigCvpcbFrame::CreateControls()
    wxButton* itemButton4 = new wxButton( itemDialog1, SAVE_CFG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton4->SetForegroundColour(wxColour(198, 0, 0));
-    itemBoxSizer3->Add(itemButton4, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
+    itemBoxSizer3->Add(itemButton4, 0, wxGROW|wxALL, 5);
    wxButton* itemButton5 = new wxButton( itemDialog1, ID_READ_OLDCFG, _("Read Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton5->SetForegroundColour(wxColour(0, 0, 255));
@@ -136,14 +138,14 @@ void KiConfigCvpcbFrame::CreateControls()
    wxButton* itemButton6 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton6->SetForegroundColour(wxColour(0, 128, 0));
-    itemBoxSizer3->Add(itemButton6, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+    itemBoxSizer3->Add(itemButton6, 0, wxGROW|wxALL, 5);
-    wxString m_NetFormatBoxStrings[] = {
+    wxArrayString m_NetFormatBoxStrings;
-        _("&PcbNew"),
+    m_NetFormatBoxStrings.Add(_("&PcbNew"));
-        _("&ViewLogic"),
+    m_NetFormatBoxStrings.Add(_("&ViewLogic"));
-        _("View &Net + Pkg")
+    m_NetFormatBoxStrings.Add(_("View &Net + Pkg"));
-    };
+    m_NetFormatBox = new wxRadioBox( itemDialog1, FORMAT_NETLIST, _("NetList Formats:"), wxDefaultPosition, wxDefaultSize, m_NetFormatBoxStrings, 1, wxRA_SPECIFY_COLS );
-    m_NetFormatBox = new wxRadioBox( itemDialog1, FORMAT_NETLIST, _("NetList Formats:"), wxDefaultPosition, wxDefaultSize, 3, m_NetFormatBoxStrings, 1, wxRA_SPECIFY_COLS );
+    m_NetFormatBox->SetSelection(0);
    itemBoxSizer3->Add(m_NetFormatBox, 0, wxGROW|wxALL, 5);
    wxStaticBox* itemStaticBoxSizer8Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Files ext:"));
@@ -154,71 +156,71 @@ void KiConfigCvpcbFrame::CreateControls()
    itemBoxSizer2->Add(m_RightBoxSizer, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
    wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxHORIZONTAL);
-    m_RightBoxSizer->Add(itemBoxSizer10, 0, wxALIGN_CENTER_HORIZONTAL, 5);
+    m_RightBoxSizer->Add(itemBoxSizer10, 1, wxALIGN_CENTER_HORIZONTAL, 5);
    wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
    itemBoxSizer10->Add(itemBoxSizer11, 0, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 5);
    wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer11->Add(itemBoxSizer12, 0, wxALIGN_CENTER_HORIZONTAL, 5);
+    itemBoxSizer11->Add(itemBoxSizer12, 1, wxALIGN_CENTER_HORIZONTAL, 5);
    wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer12->Add(itemBoxSizer13, 0, wxALIGN_CENTER_HORIZONTAL, 5);
+    itemBoxSizer12->Add(itemBoxSizer13, 0, wxGROW, 5);
-    wxButton* itemButton14 = new wxButton( itemDialog1, DEL_LIB, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton* itemButton14 = new wxButton( itemDialog1, DEL_LIB, _("Del"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton14->SetForegroundColour(wxColour(191, 0, 0));
    itemBoxSizer13->Add(itemButton14, 0, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 5);
-    wxButton* itemButton15 = new wxButton( itemDialog1, ADD_LIB, _("Add below"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton* itemButton15 = new wxButton( itemDialog1, ADD_LIB, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton15->SetForegroundColour(wxColour(0, 128, 0));
    itemBoxSizer13->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
-    wxButton* itemButton16 = new wxButton( itemDialog1, INSERT_LIB, _("Add above"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton* itemButton16 = new wxButton( itemDialog1, INSERT_LIB, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton16->SetForegroundColour(wxColour(0, 0, 255));
    itemBoxSizer13->Add(itemButton16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
    wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer12->Add(itemBoxSizer17, 0, wxGROW|wxTOP, 5);
+    itemBoxSizer12->Add(itemBoxSizer17, 1, wxGROW|wxTOP, 5);
    wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Libraries"), wxDefaultPosition, wxDefaultSize, 0 );
    itemStaticText18->SetForegroundColour(wxColour(204, 0, 0));
    itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
-    wxString* m_ListLibrStrings = NULL;
+    wxArrayString m_ListLibrStrings;
-    m_ListLibr = new wxListBox( itemDialog1, ID_LISTBOX, wxDefaultPosition, wxSize(-1, 200), 0, m_ListLibrStrings, wxLB_SINGLE );
+    m_ListLibr = new wxListBox( itemDialog1, ID_LISTBOX, wxDefaultPosition, wxSize(-1, 200), m_ListLibrStrings, wxLB_SINGLE );
-    itemBoxSizer17->Add(m_ListLibr, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+    itemBoxSizer17->Add(m_ListLibr, 1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
    wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxVERTICAL);
    itemBoxSizer10->Add(itemBoxSizer20, 0, wxGROW|wxTOP|wxBOTTOM, 5);
    wxBoxSizer* itemBoxSizer21 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer20->Add(itemBoxSizer21, 0, wxALIGN_CENTER_HORIZONTAL, 5);
+    itemBoxSizer20->Add(itemBoxSizer21, 1, wxALIGN_CENTER_HORIZONTAL, 5);
    wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer21->Add(itemBoxSizer22, 0, wxALIGN_CENTER_HORIZONTAL, 5);
+    itemBoxSizer21->Add(itemBoxSizer22, 0, wxGROW, 5);
-    wxButton* itemButton23 = new wxButton( itemDialog1, DEL_EQU, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton* itemButton23 = new wxButton( itemDialog1, DEL_EQU, _("Del"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton23->SetForegroundColour(wxColour(196, 0, 0));
    itemBoxSizer22->Add(itemButton23, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
-    wxButton* itemButton24 = new wxButton( itemDialog1, ADD_EQU, _("Add below"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton* itemButton24 = new wxButton( itemDialog1, ADD_EQU, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton24->SetForegroundColour(wxColour(0, 128, 0));
    itemBoxSizer22->Add(itemButton24, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
-    wxButton* itemButton25 = new wxButton( itemDialog1, INSERT_EQU, _("Add above"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton* itemButton25 = new wxButton( itemDialog1, INSERT_EQU, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 );
    itemButton25->SetForegroundColour(wxColour(0, 0, 255));
    itemBoxSizer22->Add(itemButton25, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
    wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer21->Add(itemBoxSizer26, 0, wxGROW|wxTOP, 5);
+    itemBoxSizer21->Add(itemBoxSizer26, 1, wxGROW|wxTOP, 5);
    wxStaticText* itemStaticText27 = new wxStaticText( itemDialog1, wxID_STATIC, _("Equiv"), wxDefaultPosition, wxDefaultSize, 0 );
    itemStaticText27->SetForegroundColour(wxColour(204, 0, 0));
    itemBoxSizer26->Add(itemStaticText27, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
-    wxString* m_ListEquivStrings = NULL;
+    wxArrayString m_ListEquivStrings;
-    m_ListEquiv = new wxListBox( itemDialog1, ID_LISTBOX1, wxDefaultPosition, wxSize(-1, 200), 0, m_ListEquivStrings, wxLB_SINGLE );
+    m_ListEquiv = new wxListBox( itemDialog1, ID_LISTBOX1, wxDefaultPosition, wxSize(-1, 200), m_ListEquivStrings, wxLB_SINGLE );
-    itemBoxSizer26->Add(m_ListEquiv, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
+    itemBoxSizer26->Add(m_ListEquiv, 1, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
    m_FileExtBoxSizerH = new wxBoxSizer(wxHORIZONTAL);
    m_RightBoxSizer->Add(m_FileExtBoxSizerH, 0, wxGROW, 5);

--- a/cvpcb/dialog_cvpcb_config.h
+++ b/cvpcb/dialog_cvpcb_config.h
@@ -35,11 +35,6 @@ class wxBoxSizer;
 ////@begin control identifiers
 #define ID_DIALOG 10000
-#define SYMBOL_KICONFIGCVPCBFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
-#define SYMBOL_KICONFIGCVPCBFRAME_TITLE _("Dialog")
-#define SYMBOL_KICONFIGCVPCBFRAME_IDNAME ID_DIALOG
-#define SYMBOL_KICONFIGCVPCBFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_KICONFIGCVPCBFRAME_POSITION wxDefaultPosition
 #define SAVE_CFG 10001
 #define ID_READ_OLDCFG 10002
 #define FORMAT_NETLIST 10003
@@ -51,6 +46,11 @@ class wxBoxSizer;
 #define ADD_EQU 10008
 #define INSERT_EQU 10009
 #define ID_LISTBOX1 10011
+#define SYMBOL_KICONFIGCVPCBFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
+#define SYMBOL_KICONFIGCVPCBFRAME_TITLE _("Cvpcb Configuration")
+#define SYMBOL_KICONFIGCVPCBFRAME_IDNAME ID_DIALOG
+#define SYMBOL_KICONFIGCVPCBFRAME_SIZE wxSize(400, 300)
+#define SYMBOL_KICONFIGCVPCBFRAME_POSITION wxDefaultPosition
 ////@end control identifiers
 /*!

--- a/cvpcb/dialog_cvpcb_config.pjd
+++ b/cvpcb/dialog_cvpcb_config.pjd
@@ -221,7 +221,7 @@
          <string name="proxy-Implementation filename">"dialog_cvpcb_config.cpp"</string>
          <string name="proxy-Header filename">"dialog_cvpcb_config.h"</string>
          <string name="proxy-XRC filename">""</string>
-          <string name="proxy-Title">"Dialog"</string>
+          <string name="proxy-Title">"Cvpcb Configuration"</string>
          <bool name="proxy-Centre">1</bool>
          <string name="proxy-Icon">""</string>
          <bool name="proxy-Dialog units">0</bool>
@@ -360,7 +360,7 @@
                <bool name="proxy-wxLEFT">1</bool>
                <bool name="proxy-wxRIGHT">1</bool>
                <bool name="proxy-wxTOP">1</bool>
-                <bool name="proxy-wxBOTTOM">0</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>
@@ -477,7 +477,7 @@
                <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-wxTOP">1</bool>
                <bool name="proxy-wxBOTTOM">1</bool>
                <bool name="proxy-wxSHAPED">0</bool>
                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
@@ -620,7 +620,7 @@
                <string name="proxy-Member variable name">""</string>
                <string name="proxy-AlignH">"Centre"</string>
                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
+                <long name="proxy-Stretch factor">1</long>
                <long name="proxy-Border">5</long>
                <bool name="proxy-wxLEFT">0</bool>
                <bool name="proxy-wxRIGHT">0</bool>
@@ -670,7 +670,7 @@
                    <string name="proxy-Member variable name">""</string>
                    <string name="proxy-AlignH">"Centre"</string>
                    <string name="proxy-AlignV">"Centre"</string>
-                    <long name="proxy-Stretch factor">0</long>
+                    <long name="proxy-Stretch factor">1</long>
                    <long name="proxy-Border">5</long>
                    <bool name="proxy-wxLEFT">0</bool>
                    <bool name="proxy-wxRIGHT">0</bool>
@@ -693,7 +693,7 @@
                      <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>
@@ -898,7 +898,7 @@
                      <string name="proxy-Member variable name">""</string>
                      <string name="proxy-AlignH">"Expand"</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">0</bool>
                      <bool name="proxy-wxRIGHT">0</bool>
@@ -1027,7 +1027,7 @@
                        <long name="proxy-Height">200</long>
                        <string name="proxy-AlignH">"Expand"</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>
@@ -1082,7 +1082,7 @@
                    <string name="proxy-Member variable name">""</string>
                    <string name="proxy-AlignH">"Centre"</string>
                    <string name="proxy-AlignV">"Centre"</string>
-                    <long name="proxy-Stretch factor">0</long>
+                    <long name="proxy-Stretch factor">1</long>
                    <long name="proxy-Border">5</long>
                    <bool name="proxy-wxLEFT">0</bool>
                    <bool name="proxy-wxRIGHT">0</bool>
@@ -1105,7 +1105,7 @@
                      <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>
@@ -1310,7 +1310,7 @@
                      <string name="proxy-Member variable name">""</string>
                      <string name="proxy-AlignH">"Expand"</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">0</bool>
                      <bool name="proxy-wxRIGHT">0</bool>
@@ -1439,7 +1439,7 @@
                        <long name="proxy-Height">200</long>
                        <string name="proxy-AlignH">"Expand"</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>

--- a/cvpcb/dialog_display_options.cpp
+++ b/cvpcb/dialog_display_options.cpp
@@ -133,7 +133,7 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
 	SetFont(*g_DialogFont);
 ////@begin WinEDA_FootprintDisplayOptionsFrame content construction
-    // Generated by DialogBlocks, 25/10/2007 10:39:07 (unregistered)
+    // Generated by DialogBlocks, 27/10/2007 09:57:04 (unregistered)
    WinEDA_FootprintDisplayOptionsFrame* itemDialog1 = this;
@@ -149,7 +149,7 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
    m_EdgesDisplayOptionStrings.Add(_("&Sketch"));
    m_EdgesDisplayOption = new wxRadioBox( itemDialog1, EDGE_SELECT, _("Edges:"), wxDefaultPosition, wxDefaultSize, m_EdgesDisplayOptionStrings, 1, wxRA_SPECIFY_COLS );
    m_EdgesDisplayOption->SetSelection(0);
-    MainBoxSizer->Add(m_EdgesDisplayOption, 1, wxALIGN_TOP|wxALL, 5);
+    MainBoxSizer->Add(m_EdgesDisplayOption, 0, wxALIGN_TOP|wxALL, 5);
    wxArrayString m_TextDisplayOptionStrings;
    m_TextDisplayOptionStrings.Add(_("&Line"));
@@ -157,7 +157,7 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
    m_TextDisplayOptionStrings.Add(_("&Sketch"));
    m_TextDisplayOption = new wxRadioBox( itemDialog1, TEXT_SELECT, _("Texts:"), wxDefaultPosition, wxDefaultSize, m_TextDisplayOptionStrings, 1, wxRA_SPECIFY_COLS );
    m_TextDisplayOption->SetSelection(0);
-    MainBoxSizer->Add(m_TextDisplayOption, 1, wxALIGN_TOP|wxALL, 5);
+    MainBoxSizer->Add(m_TextDisplayOption, 0, wxALIGN_TOP|wxALL, 5);
    ColumnBoxSizer = new wxBoxSizer(wxVERTICAL);
    MainBoxSizer->Add(ColumnBoxSizer, 1, wxALIGN_TOP|wxLEFT|wxRIGHT|wxTOP, 5);
@@ -168,14 +168,14 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls()
    m_IsShowPadNum = new wxCheckBox( itemDialog1, PADNUM_OPT, _("Display Pad &Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
    m_IsShowPadNum->SetValue(false);
-    if (WinEDA_FootprintDisplayOptionsFrame::ShowToolTips())
+    if (ShowToolTips())
        m_IsShowPadNum->SetToolTip(_("Display pad number"));
    ColumnBoxSizer->Add(m_IsShowPadNum, 1, wxGROW|wxALL, 5);
    ColumnBoxSizer->Add(5, 5, 0, wxGROW|wxTOP, 5);
    wxButton* itemButton10 = new wxButton( itemDialog1, ID_SAVE_CONFIG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
-    ColumnBoxSizer->Add(itemButton10, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
+    ColumnBoxSizer->Add(itemButton10, 0, wxALIGN_LEFT|wxALL, 5);
    wxStaticLine* itemStaticLine11 = new wxStaticLine( itemDialog1, ID_STATICLINE1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
    OuterBoxSizer->Add(itemStaticLine11, 0, wxGROW|wxALL, 5);

--- a/cvpcb/dialog_display_options.pjd
+++ b/cvpcb/dialog_display_options.pjd
@@ -10,10 +10,8 @@
    <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>
@@ -215,7 +213,6 @@
          <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_FootprintDisplayOptionsFrame"</string>
@@ -236,13 +233,6 @@
          <bool name="proxy-Hidden">0</bool>
          <bool name="proxy-Enabled">1</bool>
          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-          <string name="proxy-Data source">""</string>
-          <string name="proxy-Data class name">""</string>
-          <string name="proxy-Data class implementation filename">""</string>
-          <string name="proxy-Data class header filename">""</string>
-          <string name="proxy-Data class manager window">""</string>
-          <string name="proxy-Texture">""</string>
-          <string name="proxy-Texture style">"Tiled"</string>
          <bool name="proxy-wxDEFAULT_DIALOG_STYLE">1</bool>
          <bool name="proxy-wxCAPTION">0</bool>
          <bool name="proxy-wxRESIZE_BORDER">0</bool>
@@ -353,11 +343,6 @@
                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                <string name="proxy-Data variable">"DisplayOpt.DisplayModEdge"</string>
                <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
                <bool name="proxy-wxWANTS_CHARS">0</bool>
@@ -370,7 +355,7 @@
                <long name="proxy-Height">-1</long>
                <string name="proxy-AlignH">"Centre"</string>
                <string name="proxy-AlignV">"Top"</string>
-                <long name="proxy-Stretch factor">1</long>
+                <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>
@@ -416,11 +401,6 @@
                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                <string name="proxy-Data variable">"DisplayOpt.DisplayModText"</string>
                <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
-                <string name="proxy-Data source">""</string>
-                <string name="proxy-Data class name">""</string>
-                <string name="proxy-Data class implementation filename">""</string>
-                <string name="proxy-Data class header filename">""</string>
-                <string name="proxy-Data class manager window">""</string>
                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
                <bool name="proxy-wxWANTS_CHARS">0</bool>
@@ -433,7 +413,7 @@
                <long name="proxy-Height">-1</long>
                <string name="proxy-AlignH">"Centre"</string>
                <string name="proxy-AlignV">"Top"</string>
-                <long name="proxy-Stretch factor">1</long>
+                <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>
@@ -496,11 +476,6 @@
                  <string name="proxy-Tooltip text">""</string>
                  <string name="proxy-Data variable">"DisplayOpt.DisplayPadFill"</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>
@@ -559,11 +534,6 @@
                  <string name="proxy-Tooltip text">"Display pad number"</string>
                  <string name="proxy-Data variable">"DisplayOpt.DisplayPadNum"</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>
@@ -647,13 +617,6 @@
                  <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>
@@ -681,7 +644,7 @@
                  <bool name="proxy-wxLEFT">1</bool>
                  <bool name="proxy-wxRIGHT">1</bool>
                  <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">0</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>
@@ -794,13 +757,6 @@
                <bool name="proxy-Default">1</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">"FF0000"</string>
                <string name="proxy-Font">""</string>
@@ -860,13 +816,6 @@
                <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>
@@ -926,13 +875,6 @@
                <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>

--- a/cvpcb/displayframe.cpp
+++ b/cvpcb/displayframe.cpp
@@ -29,21 +29,26 @@ EVT_TOOL( ID_CVPCB_SHOW3D_FRAME, WinEDA_BasePcbFrame::Show3D_Frame )
 END_EVENT_TABLE()
-/*********************************************************************/
+/***************************************************************************/
-/* Constructeur de WinEDA_DisplayFrame: la fenetre de visu du composant */
+/* WinEDA_DisplayFrame: the frame to display the current focused footprint */
-/*********************************************************************/
+/***************************************************************************/
 WinEDA_DisplayFrame::WinEDA_DisplayFrame( wxWindow* father, WinEDA_App* parent,
                                          const wxString& title,
-                                          const wxPoint& pos, const wxSize& size ) :
+                                          const wxPoint& pos, const wxSize& size, long style ) :
-    WinEDA_BasePcbFrame( father, parent, CVPCB_DISPLAY_FRAME, title, pos, size )
+    WinEDA_BasePcbFrame( father, parent, CVPCB_DISPLAY_FRAME, title, pos, size, style )
 {
    m_FrameName      = wxT( "CmpFrame" );
-    m_Draw_Axis      = TRUE;                    // TRUE pour avoir les axes dessines
+    m_Draw_Axis      = TRUE;                    // TRUE if we want the axis
-    m_Draw_Grid      = TRUE;                    // TRUE pour avoir la axes dessinee
+    m_Draw_Grid      = TRUE;                    // TRUE if we want the grid
-    m_Draw_Sheet_Ref = FALSE;                   // TRUE pour avoir le cartouche dessin
+    m_Draw_Sheet_Ref = FALSE;                   // TRUE if we want the sheet references
-    SetIcon( wxIcon( wxT( "icon_cvpcb" ) ) );   // Give an icon
+    // Give an icon
+    #ifdef __WINDOWS__
+    SetIcon( wxICON( a_icon_cvpcb ) );
+    #else
+    SetIcon( wxICON( icon_cvpcb ) );
+    #endif
    SetTitle( title );
    m_Pcb = new             BOARD( NULL, this );
@@ -58,17 +63,16 @@ WinEDA_DisplayFrame::WinEDA_DisplayFrame( wxWindow* father, WinEDA_App* parent,
 }
-/*****************************************/
+/******************************************/
-/* Fonctions de base de WinEDA_DisplayFrame */
-/*****************************************/
-// Destructeur
 WinEDA_DisplayFrame::~WinEDA_DisplayFrame()
+/******************************************/
+// Destructor
 {
    delete m_CurrentScreen;
    delete m_Pcb;
    m_Parent->m_CvpcbFrame->DrawFrame = NULL;
 }
@@ -77,7 +81,8 @@ WinEDA_DisplayFrame::~WinEDA_DisplayFrame()
 void WinEDA_DisplayFrame::OnCloseWindow( wxCloseEvent& event )
 /************************************************************/
-/* Fermeture par icone ou systeme
+/* Called when the frame is closed
+ *  Save current settings (frame position and size
 */
 {
    wxPoint pos;
@@ -162,12 +167,12 @@ void WinEDA_DisplayFrame::OnLeftDClick( wxDC* DC, const wxPoint& MousePos )
 bool WinEDA_DisplayFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu )
 /*********************************************************************************/
 {
-	return true;
+    return true;
 }
 /****************************************************************/
-void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
+void WinEDA_DisplayFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
 /****************************************************************/
 {
    wxSize  delta;
@@ -216,28 +221,28 @@ void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
            m_CurrentScreen->m_O_Curseur = m_CurrentScreen->m_Curseur;
            break;
-        case WXK_NUMPAD8:       /* Deplacement curseur vers le haut */
+        case WXK_NUMPAD8:       /* cursor moved up */
        case WXK_UP:
            DrawPanel->CalcScrolledPosition( Mouse.x, Mouse.y - delta.y,
                                             &Mouse.x, &Mouse.y );
            GRMouseWarp( DrawPanel, Mouse );
            break;
-        case WXK_NUMPAD2:       /* Deplacement curseur vers le bas */
+        case WXK_NUMPAD2:       /* cursor moved down */
        case WXK_DOWN:
            DrawPanel->CalcScrolledPosition( Mouse.x, Mouse.y + delta.y,
                                             &Mouse.x, &Mouse.y );
            GRMouseWarp( DrawPanel, Mouse );
            break;
-        case WXK_NUMPAD4:       /* Deplacement curseur vers la gauche */
+        case WXK_NUMPAD4:       /*  cursor moved left */
        case WXK_LEFT:
            DrawPanel->CalcScrolledPosition( Mouse.x - delta.x, Mouse.y,
                                             &Mouse.x, &Mouse.y );
            GRMouseWarp( DrawPanel, Mouse );
            break;
-        case WXK_NUMPAD6:      /* Deplacement curseur vers la droite */
+        case WXK_NUMPAD6:      /*  cursor moved right */
        case WXK_RIGHT:
            DrawPanel->CalcScrolledPosition( Mouse.x + delta.x, Mouse.y,
                                             &Mouse.x, &Mouse.y );
@@ -246,9 +251,8 @@ void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
        }
    }
-    /* Recalcul de la position du curseur schema */
    m_CurrentScreen->m_Curseur = curpos;
-    /* Placement sur la grille generale */
+    /* Put cursor on grid */
    PutOnGrid( &m_CurrentScreen->m_Curseur );
    if( m_CurrentScreen->IsRefreshReq() )
@@ -276,7 +280,7 @@ void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
        }
    }
-    Affiche_Status_Box();    /* Affichage des coord curseur */
+    Affiche_Status_Box();    /* Display new cursor coordinates */
 }
@@ -284,10 +288,11 @@ void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse )
 void WinEDA_DisplayFrame::Process_Special_Functions( wxCommandEvent& event )
 /*************************************************************************/
-/* Traite les selections d'outils et les commandes appelees du menu POPUP
+/* Called when a tool is selected, or when a popup menu is clicked
+ *  Currently : no action exists
 */
 {
-    int id = event.GetId();
+    int        id = event.GetId();
    wxClientDC dc( DrawPanel );

--- a/cvpcb/makefile.include
+++ b/cvpcb/makefile.include
@@ -33,7 +33,6 @@ OBJECTS = $(TARGET).o \
 			setvisu.o\
 			dialog_display_options.o\
 			zoom.o \
-			visumod.o\
 			tracemod.o \
 			classpcb.o \
 			class_board.o \
@@ -136,8 +135,6 @@ setvisu.o: setvisu.cpp $(DEPEND)
 zoom.o: ../share/zoom.cpp $(DEPEND)
 	$(CC) -c $(EDACPPFLAGS) -o $@ ../share/$*.cpp
-visumod.o: visumod.cpp $(DEPEND)
 tracemod.o: ../pcbnew/tracemod.cpp ../include/gr_basic.h $(DEPEND)
 	$(CC) -c $(EDACPPFLAGS) -o $@ ../pcbnew/$*.cpp

--- a/cvpcb/setvisu.cpp
+++ b/cvpcb/setvisu.cpp
@@ -17,7 +17,8 @@
 void WinEDA_CvpcbFrame::CreateScreenCmp()
 /*******************************************/
-/* Creation de la fenetre d'affichage du composant
+/* Create or Update the frame showing the current highlighted footprint
+ *  and (if showed) the 3D display frame
 */
 {
    wxString msg, FootprintName;
@@ -28,15 +29,13 @@ void WinEDA_CvpcbFrame::CreateScreenCmp()
    if( DrawFrame == NULL )
    {
        DrawFrame = new WinEDA_DisplayFrame( this, m_Parent, _( "Module" ),
-                                            wxPoint( 0, 0 ), wxSize( 600, 400 ) );
+                                             wxPoint( 0, 0 ), wxSize( 600,
+                                                                      400 ),
+                                             KICAD_DEFAULT_DRAWFRAME_STYLE |
+                                             wxFRAME_FLOAT_ON_PARENT );
        IsNew = TRUE;
+        DrawFrame->Show( TRUE );
    }
-    else
-        DrawFrame->Maximize( FALSE );
-    DrawFrame->SetFocus();  /* Active entree clavier */
-    DrawFrame->Show( TRUE );
    if( !FootprintName.IsEmpty() )
    {
@@ -44,19 +43,19 @@ void WinEDA_CvpcbFrame::CreateScreenCmp()
        DrawFrame->SetTitle( msg );
        STOREMOD* Module = GetModuleDescrByName( FootprintName );
        msg = _( "Lib: " );
        if( Module )
            msg += Module->m_LibName;
        else
            msg += wxT( "???" );
        DrawFrame->SetStatusText( msg, 0 );
        if( DrawFrame->m_Pcb->m_Modules )
        {
            // there is only one module in the list
            DrawFrame->m_Pcb->m_Modules->DeleteStructure();
            DrawFrame->m_Pcb->m_Modules = NULL;
        }
@@ -73,3 +72,32 @@ void WinEDA_CvpcbFrame::CreateScreenCmp()
            DrawFrame->m_Draw3DFrame->NewDisplay();
    }
 }
+/*******************************************************************/
+void WinEDA_DisplayFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
+/*******************************************************************/
+/* Draws the current highlighted footprint */
+{
+    if( !m_Pcb )
+        return;
+    MODULE* Module = m_Pcb->m_Modules;
+    ActiveScreen = (PCB_SCREEN*) GetScreen();
+    if( EraseBg )
+        DrawPanel->EraseScreen( DC );
+    DrawPanel->DrawBackGround( DC );
+    if( Module )
+    {
+        Module->Draw( DrawPanel, DC, wxPoint( 0, 0 ), GR_COPY );
+        Module->Display_Infos( this );
+    }
+    Affiche_Status_Box();
+    DrawPanel->Trace_Curseur( DC );
+}
--- a/cvpcb/visumod.cpp
+++ b/cvpcb/visumod.cpp
-/************************************************/
-/* Routines de visualisation du module courant  */
-/************************************************/
-#include "fctsys.h"
-#include "common.h"
-#include "cvpcb.h"
-#include "macros.h"
-#include "pcbnew.h"
-#include "protos.h"
-/* defines locaux */
-/* Variables locales */
-/*******************************************************************/
-void WinEDA_DisplayFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
-/*******************************************************************/
-/* Affiche le module courant */
-{
-    if( !m_Pcb )
-        return;
-    MODULE* Module = m_Pcb->m_Modules;
-    ActiveScreen = (PCB_SCREEN*) GetScreen();
-    if( EraseBg )
-        DrawPanel->EraseScreen( DC );
-    DrawPanel->DrawBackGround( DC );
-    if( Module )
-    {
-        Module->Draw( DrawPanel, DC, wxPoint( 0, 0 ), GR_COPY );
-        Module->Display_Infos( this );
-    }
-    Affiche_Status_Box();
-    DrawPanel->Trace_Curseur( DC );
-}
--- a/eeschema/dialog_set_status.cpp.notused
+++ b/eeschema/dialog_set_status.cpp.notused
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dialog_set_status.cpp
-// Purpose:     
-// Author:      jean-pierre Charras
-// Modified by: 
-// Created:     11/02/2006 21:42:23
-// RCS-ID:      
-// Copyright:   License GNU
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-// Generated by DialogBlocks (unregistered), 11/02/2006 21:42:23
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dialog_set_status.h"
-#endif
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-////@begin includes
-////@end includes
-#include "dialog_set_status.h"
-////@begin XPM images
-////@end XPM images
-/*!
- * WinEDA_ConfigFrame type definition
- */
-IMPLEMENT_DYNAMIC_CLASS( WinEDA_ConfigFrame, wxDialog )
-/*!
- * WinEDA_ConfigFrame event table definition
- */
-BEGIN_EVENT_TABLE( WinEDA_ConfigFrame, wxDialog )
-////@begin WinEDA_ConfigFrame event table entries
-    EVT_BUTTON( ID_BUTTON, WinEDA_ConfigFrame::OnButtonClick )
-    EVT_BUTTON( ID_BUTTON1, WinEDA_ConfigFrame::OnButton1Click )
-    EVT_BUTTON( ID_BUTTON2, WinEDA_ConfigFrame::OnButton2Click )
-    EVT_BUTTON( ID_BUTTON3, WinEDA_ConfigFrame::OnButton3Click )
-////@end WinEDA_ConfigFrame event table entries
-END_EVENT_TABLE()
-/*!
- * WinEDA_ConfigFrame constructors
- */
-WinEDA_ConfigFrame::WinEDA_ConfigFrame( )
-{
-}
-WinEDA_ConfigFrame::WinEDA_ConfigFrame( WinEDA_SchematicFrame* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-	m_Parent = parent;
-	m_LibListChanged = FALSE;
-	msg = _("from ") + EDA_Appl->m_CurrentOptionFile;
-	SetTitle(msg);
-    Create(parent, id, caption, pos, size, style);
-}
-/*!
- * WinEDA_ConfigFrame creator
- */
-bool WinEDA_ConfigFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
-{
-////@begin WinEDA_ConfigFrame member initialisation
-    m_CmpfileExtText = NULL;
-    m_NetfileExtText = NULL;
-    m_LibfileExtText = NULL;
-    m_SymbolfileExtText = NULL;
-    m_SchfileExtText = NULL;
-    m_ListLibr = NULL;
-    m_CmpfileExtText = NULL;
-    m_LibDirCtrl = NULL;
-////@end WinEDA_ConfigFrame member initialisation
-////@begin WinEDA_ConfigFrame creation
-    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
-    wxDialog::Create( parent, id, caption, pos, size, style );
-    CreateControls();
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
-    Centre();
-////@end WinEDA_ConfigFrame creation
-    return true;
-}
-/*!
- * Control creation for WinEDA_ConfigFrame
- */
-void WinEDA_ConfigFrame::CreateControls()
-{    
-	SetFont(*g_DialogFont);
-////@begin WinEDA_ConfigFrame content construction
-    // Generated by DialogBlocks, 11/02/2006 22:06:21 (unregistered)
-    WinEDA_ConfigFrame* itemDialog1 = this;
-    wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
-    itemDialog1->SetSizer(itemBoxSizer2);
-    wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer2->Add(itemBoxSizer3, 0, 0, 0);
-    wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    wxButton* itemButton5 = new wxButton( itemDialog1, ID_BUTTON, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton5->SetForegroundColour(wxColour(204, 0, 0));
-    itemBoxSizer4->Add(itemButton5, 0, wxGROW|wxALL, 5);
-    wxString itemRadioBox6Strings[] = {
-        _("&PcbNew"),
-        _("&OrcadPcb2"),
-        _("&CadStar"),
-        _("&Spice"),
-        _("Other")
-    };
-    wxRadioBox* itemRadioBox6 = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("NetList Formats:"), wxDefaultPosition, wxDefaultSize, 5, itemRadioBox6Strings, 1, wxRA_SPECIFY_COLS );
-    itemBoxSizer4->Add(itemRadioBox6, 0, wxGROW|wxALL, 5);
-    wxStaticBox* itemStaticBoxSizer7Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Files ext:"));
-    wxStaticBoxSizer* itemStaticBoxSizer7 = new wxStaticBoxSizer(itemStaticBoxSizer7Static, wxVERTICAL);
-    itemBoxSizer4->Add(itemStaticBoxSizer7, 0, wxGROW|wxALL, 5);
-    m_CmpfileExtText = new wxStaticText( itemDialog1, wxID_STATIC, _("Cmp file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticBoxSizer7->Add(m_CmpfileExtText, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
-    m_NetfileExtText = new wxStaticText( itemDialog1, wxID_STATIC, _("Net file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticBoxSizer7->Add(m_NetfileExtText, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
-    m_LibfileExtText = new wxStaticText( itemDialog1, wxID_STATIC, _("Library file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticBoxSizer7->Add(m_LibfileExtText, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
-    m_SymbolfileExtText = new wxStaticText( itemDialog1, wxID_STATIC, _("Symbol file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticBoxSizer7->Add(m_SymbolfileExtText, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
-    m_SchfileExtText = new wxStaticText( itemDialog1, wxID_STATIC, _("Schematic file Ext: "), wxDefaultPosition, wxDefaultSize, 0 );
-    m_SchfileExtText->Enable(false);
-    itemStaticBoxSizer7->Add(m_SchfileExtText, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
-    wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer3->Add(itemBoxSizer13, 0, wxGROW|wxALL, 5);
-    wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer13->Add(itemBoxSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
-    wxButton* itemButton15 = new wxButton( itemDialog1, ID_BUTTON1, _("Del"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton15->SetForegroundColour(wxColour(204, 0, 0));
-    itemBoxSizer14->Add(itemButton15, 0, wxGROW|wxALL, 5);
-    wxButton* itemButton16 = new wxButton( itemDialog1, ID_BUTTON2, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton16->SetForegroundColour(wxColour(0, 128, 0));
-    itemBoxSizer14->Add(itemButton16, 0, wxGROW|wxALL, 5);
-    wxButton* itemButton17 = new wxButton( itemDialog1, ID_BUTTON3, _("Ins"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton17->SetForegroundColour(wxColour(0, 0, 255));
-    itemBoxSizer14->Add(itemButton17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-    wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Libraries:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText18->SetForegroundColour(wxColour(196, 0, 0));
-    itemBoxSizer13->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
-    wxString* m_ListLibrStrings = NULL;
-    m_ListLibr = new wxListBox( itemDialog1, ID_LISTBOX, wxDefaultPosition, wxSize(-1, 250), 0, m_ListLibrStrings, wxLB_SINGLE );
-    itemBoxSizer13->Add(m_ListLibr, 0, wxGROW|wxALL, 5);
-    m_CmpfileExtText = new wxStaticText( itemDialog1, wxID_STATIC, _("Library files path:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_CmpfileExtText->SetForegroundColour(wxColour(198, 0, 0));
-    itemBoxSizer2->Add(m_CmpfileExtText, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
-    m_LibDirCtrl = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer2->Add(m_LibDirCtrl, 0, wxGROW|wxALL, 5);
-////@end WinEDA_ConfigFrame content construction
-}
-/*!
- * Should we show tooltips?
- */
-bool WinEDA_ConfigFrame::ShowToolTips()
-{
-    return true;
-}
-/*!
- * Get bitmap resources
- */
-wxBitmap WinEDA_ConfigFrame::GetBitmapResource( const wxString& name )
-{
-    // Bitmap retrieval
-////@begin WinEDA_ConfigFrame bitmap retrieval
-    wxUnusedVar(name);
-    return wxNullBitmap;
-////@end WinEDA_ConfigFrame bitmap retrieval
-}
-/*!
- * Get icon resources
- */
-wxIcon WinEDA_ConfigFrame::GetIconResource( const wxString& name )
-{
-    // Icon retrieval
-////@begin WinEDA_ConfigFrame icon retrieval
-    wxUnusedVar(name);
-    return wxNullIcon;
-////@end WinEDA_ConfigFrame icon retrieval
-}
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON
- */
-void WinEDA_ConfigFrame::OnButtonClick( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON in WinEDA_ConfigFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON in WinEDA_ConfigFrame. 
-}
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON1
- */
-void WinEDA_ConfigFrame::OnButton1Click( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON1 in WinEDA_ConfigFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON1 in WinEDA_ConfigFrame. 
-}
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON2
- */
-void WinEDA_ConfigFrame::OnButton2Click( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON2 in WinEDA_ConfigFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON2 in WinEDA_ConfigFrame. 
-}
-/*!
- * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON3
- */
-void WinEDA_ConfigFrame::OnButton3Click( wxCommandEvent& event )
-{
-////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON3 in WinEDA_ConfigFrame.
-    // Before editing this code, remove the block markers.
-    event.Skip();
-////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON3 in WinEDA_ConfigFrame. 
-}
--- a/eeschema/dialog_set_status.h.notused
+++ b/eeschema/dialog_set_status.h.notused
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dialog_set_status.h
-// Purpose:     
-// Author:      jean-pierre Charras
-// Modified by: 
-// Created:     11/02/2006 21:42:23
-// RCS-ID:      
-// Copyright:   License GNU
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-// Generated by DialogBlocks (unregistered), 11/02/2006 21:42:23
-#ifndef _DIALOG_SET_STATUS_H_
-#define _DIALOG_SET_STATUS_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dialog_set_status.h"
-#endif
-/*!
- * Includes
- */
-////@begin includes
-////@end includes
-/*!
- * Forward declarations
- */
-////@begin forward declarations
-////@end forward declarations
-/*!
- * Control identifiers
- */
-////@begin control identifiers
-#define ID_DIALOG 10000
-#define SYMBOL_WINEDA_CONFIGFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_WINEDA_CONFIGFRAME_TITLE _("from ")
-#define SYMBOL_WINEDA_CONFIGFRAME_IDNAME ID_DIALOG
-#define SYMBOL_WINEDA_CONFIGFRAME_SIZE wxSize(400, 300)
-#define SYMBOL_WINEDA_CONFIGFRAME_POSITION wxDefaultPosition
-#define ID_BUTTON 10001
-#define ID_RADIOBOX 10006
-#define ID_BUTTON1 10002
-#define ID_BUTTON2 10003
-#define ID_BUTTON3 10004
-#define ID_LISTBOX 10005
-#define ID_TEXTCTRL 10007
-////@end control identifiers
-/*!
- * Compatibility
- */
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-/*!
- * WinEDA_ConfigFrame class declaration
- */
-class WinEDA_ConfigFrame: public wxDialog
-{    
-    DECLARE_DYNAMIC_CLASS( WinEDA_ConfigFrame )
-    DECLARE_EVENT_TABLE()
-public:
-    /// Constructors
-    WinEDA_ConfigFrame( );
-    WinEDA_ConfigFrame( WinEDA_SchematicFrame* parent, wxWindowID id = SYMBOL_WINEDA_CONFIGFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_CONFIGFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_CONFIGFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_CONFIGFRAME_SIZE, long style = SYMBOL_WINEDA_CONFIGFRAME_STYLE );
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_CONFIGFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_CONFIGFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_CONFIGFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_CONFIGFRAME_SIZE, long style = SYMBOL_WINEDA_CONFIGFRAME_STYLE );
-    /// Creates the controls and sizers
-    void CreateControls();
-////@begin WinEDA_ConfigFrame event handler declarations
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON
-    void OnButtonClick( wxCommandEvent& event );
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON1
-    void OnButton1Click( wxCommandEvent& event );
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON2
-    void OnButton2Click( wxCommandEvent& event );
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON3
-    void OnButton3Click( wxCommandEvent& event );
-////@end WinEDA_ConfigFrame event handler declarations
-////@begin WinEDA_ConfigFrame member function declarations
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end WinEDA_ConfigFrame member function declarations
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-////@begin WinEDA_ConfigFrame member variables
-    wxStaticText* m_CmpfileExtText;
-    wxStaticText* m_NetfileExtText;
-    wxStaticText* m_LibfileExtText;
-    wxStaticText* m_SymbolfileExtText;
-    wxStaticText* m_SchfileExtText;
-    wxListBox* m_ListLibr;
-    wxStaticText* m_CmpfileExtText;
-    wxTextCtrl* m_LibDirCtrl;
-////@end WinEDA_ConfigFrame member variables
-};
-#endif
-    // _DIALOG_SET_STATUS_H_
--- a/eeschema/editpart.cpp.notused
+++ b/eeschema/editpart.cpp.notused
--- a/eeschema/eeclass.cpp.notused
+++ b/eeschema/eeclass.cpp.notused
-/**********************************************************/
-/*	EECLASS.CPP											  */
-/* fonctions relatives aux classes definies dans EESCHEMA */
-/**********************************************************/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "program.h"
-#include "libcmp.h"
-#include "general.h"
-#include "protos.h"
-/************************************************************/
-void SetStructFather( EDA_BaseStruct* Struct, BASE_SCREEN* Screen )
-/************************************************************/
-{
-    switch( Struct->Type() )
-    {
-    case DRAW_POLYLINE_STRUCT_TYPE:
-    case DRAW_JUNCTION_STRUCT_TYPE:
-    case DRAW_TEXT_STRUCT_TYPE:
-    case DRAW_LABEL_STRUCT_TYPE:
-    case DRAW_GLOBAL_LABEL_STRUCT_TYPE:
-    case DRAW_LIB_ITEM_STRUCT_TYPE:
-    case DRAW_SEGMENT_STRUCT_TYPE:
-    case DRAW_BUSENTRY_STRUCT_TYPE:
-    case DRAW_SHEET_STRUCT_TYPE:
-    case DRAW_MARKER_STRUCT_TYPE:
-    case DRAW_NOCONNECT_STRUCT_TYPE:
-        Struct->m_Parent = Screen;
-        break;
-    case DRAW_SHEETLABEL_STRUCT_TYPE:
-    case DRAW_PICK_ITEM_STRUCT_TYPE:
-        break;
-    default:
-        break;
-    }
-}
-/*************************************************************/
-void EDA_BaseStruct::Place( WinEDA_DrawFrame* frame, wxDC* DC )
-/*************************************************************/
-{
-    if( m_Flags & IS_NEW )
-    {
-        Pnext = frame->m_CurrentScreen->EEDrawList;
-        frame->m_CurrentScreen->EEDrawList = this;
-        g_ItemToRepeat = this;
-    }
-    m_Flags = 0;
-    SetFlagModify( frame->GetScreen() );
-    frame->GetScreen()->SetCurItem( NULL );
-    frame->DrawPanel->ManageCurseur = NULL;
-    frame->DrawPanel->ForceCloseManageCurseur = NULL;
-    frame->DrawPanel->CursorOff( DC );      // Erase schematic cursor
-    RedrawOneStruct( frame->DrawPanel, DC, this, GR_DEFAULT_DRAWMODE );
-    frame->DrawPanel->CursorOn( DC );       // Display schematic cursor
-}
-/**************************************************/
-/* Class SCH_SCREEN: classe de gestion d'un affichage pour schematique */
-/***************************************************/
-static int table_zoom[] = { 1, 2, 4, 8, 16, 32, 64, 128, 0 }; /* Valeurs standards du zoom */
-/* Constructeur de SCREEN */
-SCH_SCREEN::SCH_SCREEN( EDA_BaseStruct* parent, WinEDA_DrawFrame* frame_source, int idtype ) :
-    BASE_SCREEN( parent, frame_source, idtype )
-{
-    EEDrawList = NULL;                  /* Schematic items list */
-    m_Zoom = 32;
-    m_Grid = wxSize( 50, 50 );          /* pas de la grille */
-    SetZoomList( table_zoom );
-    SetGridList( g_GridList );
-    m_UndoRedoCountMax = 10;
-}
-/****************************/
-SCH_SCREEN::~SCH_SCREEN()
-/****************************/
-{
-    ClearUndoRedoList();
-    FreeDrawList();
-}
-/*************************************/
-SCH_SCREEN* SCH_SCREEN::GenCopy()
-/*************************************/
-{
-// TODO
-    return NULL;
-}
-/***********************************/
-void SCH_SCREEN::FreeDrawList()
-/***********************************/
-/* Routine to clear EESchema drawing list of a screen.
- */
-{
-    EDA_BaseStruct* DrawStruct;
-    while( EEDrawList != NULL )
-    {
-        DrawStruct = EEDrawList;
-        EEDrawList = EEDrawList->Pnext;
-        delete DrawStruct;
-    }
-}
--- a/eeschema/fieldedi.cpp.notused
+++ b/eeschema/fieldedi.cpp.notused
--- a/eeschema/genliste.cpp.notused
+++ b/eeschema/genliste.cpp.notused
--- a/eeschema/libedpart.cpp.notused
+++ b/eeschema/libedpart.cpp.notused
--- a/eeschema/libframe.cpp
+++ b/eeschema/libframe.cpp
@@ -63,8 +63,9 @@ WinEDA_LibeditFrame::WinEDA_LibeditFrame( wxWindow*       father,
                                          WinEDA_App*     parent,
                                          const wxString& title,
                                          const wxPoint&  pos,
-                                          const wxSize&   size ) :
+                                          const wxSize&   size,
-    WinEDA_DrawFrame( father, LIBEDITOR_FRAME, parent, title, pos, size )
+										  long style ) :
+    WinEDA_DrawFrame( father, LIBEDITOR_FRAME, parent, title, pos, size, style )
 {
    m_FrameName = wxT( "LibeditFrame" );
    m_Draw_Axis = TRUE;             // TRUE pour avoir les axes dessines

--- a/eeschema/options.cpp.notused
+++ b/eeschema/options.cpp.notused
-	/*************************/
-	/* eeschema: options.cpp */
-	/*************************/
-/*
-Gestion de la fenetre des options generales:
-	Grille
-	Unites d'affichage
-	options complementaires (increments X, Y et label pour la fct de repetition
-*/
-#include "fctsys.h"
-#include "gr_basic.h"
-#include "common.h"
-#include "program.h"
-#include "libcmp.h"
-#include "general.h"
-#include "id.h"
-#include "wx/spinctrl.h"
-#include "protos.h"
-/* Variables locales */
-/* Fonctions locales: */
-enum options_id {
-	ID_OPTION_ACCEPT = 3900,
-	ID_OPTION_CANCEL,
-	ID_GRID_SIZE,
-	ID_SHOW_GRID,
-	ID_GRID_NORMAL,
-	ID_GRID_SMALL,
-	ID_GRID_VERY_SMALL,
-	ID_SEL_SHOW_PINS,
-	ID_SEL_HV_WIRE,
-	ID_SEL_SHOW_PAGE_LIMITS,
-	ID_SEL_METRIC
-};
-/*************************************************************/
-/* classe derivee pour la frame de Configuration des options*/
-/*************************************************************/
-class WinEDA_SetOptionsFrame: public wxDialog
-{
-private:
-	WinEDA_DrawFrame * m_Parent;
-	wxCheckBox * m_ShowGridButt;
-	wxCheckBox * m_AutoPANOpt;
-	wxRadioBox * m_SelGridSize;
-	wxRadioBox * m_SelShowPins;
-	wxRadioBox * m_Selunits;
-	wxRadioBox * m_SelDirWires;
-	wxRadioBox * m_Show_Page_Limits;
-	WinEDA_SizeCtrl * m_DeltaStepCtrl;
-	wxSpinCtrl * m_DeltaLabelCtrl;
-public:
-	// Constructor and destructor
-	WinEDA_SetOptionsFrame(WinEDA_DrawFrame *parent, const wxPoint& framepos);
-	~WinEDA_SetOptionsFrame() {};
-private:
-	void Accept(wxCommandEvent& event);
-	void OnCancel(wxCommandEvent& event);
-	DECLARE_EVENT_TABLE()
-};
-/* Table des evenements pour WinEDA_SetOptionsFrame */
-BEGIN_EVENT_TABLE(WinEDA_SetOptionsFrame, wxDialog)
-	EVT_BUTTON(ID_OPTION_ACCEPT, WinEDA_SetOptionsFrame::Accept)
-	EVT_BUTTON(ID_OPTION_CANCEL, WinEDA_SetOptionsFrame::OnCancel)
-END_EVENT_TABLE()
-/**************************************************************************/
-void DisplayOptionFrame(WinEDA_DrawFrame * parent, const wxPoint & framepos)
-/**************************************************************************/
-{
-	WinEDA_SetOptionsFrame * frame =
-			new WinEDA_SetOptionsFrame(parent, framepos);
-	frame->ShowModal(); frame->Destroy();
-}
-/***********************************************************************/
-WinEDA_SetOptionsFrame::WinEDA_SetOptionsFrame(WinEDA_DrawFrame *parent,
-							const wxPoint& framepos):
-		wxDialog(parent, -1, _("EESchema Preferences"), framepos,
-			wxSize(450, 340), DIALOG_STYLE)
-/***********************************************************************/
-{
-#define START_Y 10
-wxButton * Button;
-wxPoint pos;
-wxSize size;
-int w, h;
-	m_Parent = parent;
-	SetFont(*g_DialogFont);
-	pos.x = 330; pos.y = START_Y;
-	Button = new wxButton(this, ID_OPTION_ACCEPT, _("OK"), pos);
-	Button->SetForegroundColour(*wxRED);
-	pos.y += Button->GetDefaultSize().y + 5;
-	Button = new wxButton(this, ID_OPTION_CANCEL, _("Cancel"), pos);
-	Button->SetForegroundColour(*wxBLUE);
-	pos.x = 5;  pos.y = START_Y;
-	m_ShowGridButt = new wxCheckBox( this, ID_SHOW_GRID, _("Show grid"),
-				pos);
-	m_ShowGridButt->SetValue(m_Parent->m_Draw_Grid);
-	pos.x += 150;
-	m_AutoPANOpt = new wxCheckBox( this, ID_SHOW_GRID, _("Auto PAN"),
-				pos);
-	m_AutoPANOpt->SetValue(m_Parent->DrawPanel-> m_AutoPAN_Enable);
-	m_AutoPANOpt->SetForegroundColour(*wxBLUE);
-	pos.x = 5; pos.y += 25;
-wxString grid_choice[6] = { _("Normal (50 mils)"),
-							_("Small (25 mils)"),
-							_("Very small (10 mils)"),
-							_("Special (5 mils)"),
-							_("Special (2 mils)"),
-							_("Special (1 mil)"),	};
-	m_SelGridSize = new wxRadioBox(this, ID_GRID_SIZE,
-			_("Grid Size"), pos,
-			wxDefaultSize, 6, grid_choice, 1, wxRA_SPECIFY_COLS);
-	if ( m_Parent->GetScreen() )
-	{
-		switch( m_Parent->GetScreen()->GetGrid().x )
-		{
-			case 50:
-				m_SelGridSize->SetSelection(0);
-				break;
-			case 25:
-				m_SelGridSize->SetSelection(1);
-				break;
-			case 10:
-				m_SelGridSize->SetSelection(2);
-				break;
-			case 5:
-				m_SelGridSize->SetSelection(3);
-				break;
-			case 2:
-				m_SelGridSize->SetSelection(4);
-				break;
-			case 1:
-				m_SelGridSize->SetSelection(5);
-				break;
-			default:
-				DisplayError(this, wxT("WinEDA_SetOptionsFrame: Grid value not handle"));
-				break;
-		}
-	}
-	/* Choix d' l'affichage des pins invisibles */
-	m_SelGridSize->GetSize(&w, &h);
-	pos.y += h + 20;
-wxString pin_choice[2] = { _("Normal"), _("Show alls") };
-	m_SelShowPins = new wxRadioBox(this, ID_SEL_SHOW_PINS,
-			_("Show pins"), pos,
-			wxDefaultSize, 2, pin_choice, 1, wxRA_SPECIFY_COLS);
-	m_SelShowPins->SetSelection( g_ShowAllPins ? TRUE : FALSE);
-	/* Choix de l'affichage des unites */
-	pos.x = 15 + w;  pos.y = START_Y + 25;
-wxString unit_choice[2] = { _("millimeters"), _("inches") };
-	m_Selunits = new wxRadioBox(this, ID_SEL_METRIC,
-			_("Units"), pos,
-			wxDefaultSize, 2, unit_choice, 1, wxRA_SPECIFY_COLS);
-	m_Selunits->SetSelection( UnitMetric ? 0 : 1);
-	/* Choix de l'orientation des bus et wires */
-	m_Selunits->GetSize(&w, &h);
-	pos.y += h + 15;
-wxString dir_choice[2] = { _("Horiz/Vertical"), _("Any") };
-	m_SelDirWires = new wxRadioBox(this, ID_SEL_HV_WIRE,
-			_("Wires - Bus orient"), pos,
-			wxDefaultSize, 2, dir_choice, 1, wxRA_SPECIFY_COLS);
-	m_SelDirWires->SetSelection( g_HVLines ? 0 : 1);
-	m_SelDirWires->GetSize(&w, &h);
-	pos.y += h + 15;
-wxString show_page_limits_choice[2] = { _("Yes"), _("No") };
-	m_Show_Page_Limits = new wxRadioBox(this, ID_SEL_SHOW_PAGE_LIMITS,
-			_("Show page limits"), pos,
-			wxDefaultSize, 2, show_page_limits_choice, 1, wxRA_SPECIFY_COLS);
-	m_Show_Page_Limits->SetSelection( g_ShowPageLimits ? 0 : 1);
-	/* Choix des parametres pour la fonction de repetition */
-	size.x = 100; size.y = -1;
-	pos.y = 90; pos.x = 320;
-	m_DeltaStepCtrl = new WinEDA_SizeCtrl(this, _("Delta Step"),
-			g_RepeatStep,
-			UnitMetric, pos, m_Parent->m_InternalUnits);
-	pos.y += 10 + m_DeltaStepCtrl->GetDimension().y;
-	new wxStaticText(this, -1, _("Delta Label:"),
-							wxPoint(pos.x, pos.y ),
-							wxSize(-1,-1), 0 );
-wxString val;
-	pos.y += 14;
-	val << g_RepeatDeltaLabel;
-	m_DeltaLabelCtrl = new wxSpinCtrl(this, -1, val, pos);
-	m_DeltaLabelCtrl->SetRange(-16, +16);
-}
-/**************************************************************************/
-void WinEDA_SetOptionsFrame::OnCancel(wxCommandEvent& event)
-/**************************************************************************/
-{
-	Close(TRUE);
-}
-/**************************************************************************/
-void WinEDA_SetOptionsFrame::Accept(wxCommandEvent& event)
-/**************************************************************************/
-{
-wxSize grid;
-bool setgrid = TRUE;
-	g_RepeatStep = m_DeltaStepCtrl->GetCoord();
-	g_RepeatDeltaLabel = m_DeltaLabelCtrl->GetValue();
-	if ( m_Show_Page_Limits->GetSelection() == 0 ) g_ShowPageLimits = TRUE;
-	else g_ShowPageLimits = FALSE;
-	if ( m_SelDirWires->GetSelection() == 0 ) g_HVLines = 1;
-	else g_HVLines = 0;
-	if ( m_Selunits->GetSelection() == 0 ) UnitMetric = 1;
-	else  UnitMetric = 0;
-	if ( m_SelShowPins->GetSelection() == 0 ) g_ShowAllPins = FALSE;
-	else g_ShowAllPins = TRUE;
-	g_ShowGrid = m_Parent->m_Draw_Grid = m_ShowGridButt->GetValue();
-	m_Parent->DrawPanel->m_AutoPAN_Enable = m_AutoPANOpt->GetValue();
-	switch( m_SelGridSize->GetSelection() )
-		{
-		default:
-			setgrid = FALSE;
-			break;
-		case 0:
-			grid = wxSize(50,50);
-			break;
-		case 1:
-			grid = wxSize(25,25);
-			break;
-		case 2:
-			grid = wxSize(10,10);
-			break;
-		}
-	if ( m_Parent->m_CurrentScreen )
-	{
-		if ( setgrid ) m_Parent->m_CurrentScreen->SetGrid(grid);
-		m_Parent->m_CurrentScreen->SetRefreshReq();
-	}
-	Close(TRUE);
-}
--- a/eeschema/optionsframe.cpp.notused
+++ b/eeschema/optionsframe.cpp.notused
--- a/eeschema/optionsframe.h.notused
+++ b/eeschema/optionsframe.h.notused
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -116,8 +116,8 @@ END_EVENT_TABLE()
 	/****************/
 WinEDA_SchematicFrame::	WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *parent,
-					const wxString & title, const wxPoint& pos, const wxSize& size) :
+					const wxString & title, const wxPoint& pos, const wxSize& size, long style) :
-					WinEDA_DrawFrame(father, SCHEMATIC_FRAME, parent, title, pos, size)
+					WinEDA_DrawFrame(father, SCHEMATIC_FRAME, parent, title, pos, size, style)
 {
 	m_FrameName = wxT("SchematicFrame");
 	m_Draw_Axis = FALSE;			// TRUE pour avoir les axes dessines

--- a/gerbview/gerberframe.cpp
+++ b/gerbview/gerberframe.cpp
@@ -124,8 +124,8 @@ END_EVENT_TABLE()
 	/****************/
 WinEDA_GerberFrame::WinEDA_GerberFrame(wxWindow * father, WinEDA_App *parent,
-					const wxString & title, const wxPoint& pos, const wxSize& size) :
+					const wxString & title, const wxPoint& pos, const wxSize& size, long style) :
-					WinEDA_BasePcbFrame(father, parent, GERBER_FRAME, title, pos, size)
+					WinEDA_BasePcbFrame(father, parent, GERBER_FRAME, title, pos, size, style)
 {
 	m_FrameName = wxT("GerberFrame");
 	m_Draw_Axis = TRUE;			// TRUE pour avoir les axes dessines

--- a/include/wxstruct.h
+++ b/include/wxstruct.h
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
--- a/pcbnew/clean.cpp
+++ b/pcbnew/clean.cpp
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
--- a/share/drawframe.cpp
+++ b/share/drawframe.cpp
--- a/share/selcolor.cpp.notused
+++ b/share/selcolor.cpp.notused