diff --git a/cvpcb/displayframe.cpp b/cvpcb/displayframe.cpp
index faba69efb7..ad1f8c1f86 100644
--- a/cvpcb/displayframe.cpp
+++ b/cvpcb/displayframe.cpp
@@ -73,11 +73,11 @@ WinEDA_DisplayFrame::WinEDA_DisplayFrame( WinEDA_CvpcbFrame* father,
 WinEDA_DisplayFrame::~WinEDA_DisplayFrame()
 /******************************************/
 {
+    delete GetBoard();
+
     delete GetBaseScreen();
     SetBaseScreen( 0 );
 
-    delete GetBoard();
-
     ( (WinEDA_CvpcbFrame*) wxGetApp().GetTopWindow() )->DrawFrame = NULL;
 }
 
@@ -310,7 +310,7 @@ void WinEDA_DisplayFrame::Show3D_Frame( wxCommandEvent& event )
 }
 
 /* Virtual fonction needed by the PCB_SCREEN class derived from BASE_SCREEN
-* this is a virtaul pure function in BASE_SCREEN
+* this is a virtual pure function in BASE_SCREEN
 * do nothing in cvpcb
 * could be removed later
 */
diff --git a/eeschema/dialog_edit_component_in_lib.pjd b/eeschema/dialog_edit_component_in_lib.pjd
deleted file mode 100644
index 6c3a1e1321..0000000000
--- a/eeschema/dialog_edit_component_in_lib.pjd
+++ /dev/null
@@ -1,1998 +0,0 @@
-<?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>
-    <string name="html_path">""</string>
-    <string name="title">""</string>
-    <string name="author">""</string>
-    <string name="description">""</string>
-    <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>
-    <bool name="generate_for_xrced">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">"/////////////////////////////////////////////////////////////////////////////
-// Name:        %HEADER-FILENAME%
-// Purpose:     
-// Author:      %AUTHOR%
-// Modified by: 
-// Created:     %DATE%
-// RCS-ID:      
-// Copyright:   %COPYRIGHT%
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-
-"</string>
-    <string name="cpp_implementation_comment">"/////////////////////////////////////////////////////////////////////////////
-// Name:        %SOURCE-FILENAME%
-// Purpose:     
-// Author:      %AUTHOR%
-// Modified by: 
-// Created:     %DATE%
-// RCS-ID:      
-// Copyright:   %COPYRIGHT%
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-
-"</string>
-    <string name="cpp_symbols_file_comment">"/////////////////////////////////////////////////////////////////////////////
-// Name:        %SYMBOLS-FILENAME%
-// Purpose:     Symbols file
-// Author:      %AUTHOR%
-// Modified by: 
-// Created:     %DATE%
-// RCS-ID:      
-// Copyright:   %COPYRIGHT%
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-
-"</string>
-    <string name="cpp_header_preamble">"#if defined(__GNUG__) &amp;&amp; !defined(NO_GCC_PRAGMA)
-#pragma interface &quot;%HEADER-FILENAME%&quot;
-#endif
-
-"</string>
-    <string name="cpp_implementation_preamble">"#if defined(__GNUG__) &amp;&amp; !defined(NO_GCC_PRAGMA)
-#pragma implementation &quot;%HEADER-FILENAME%&quot;
-#endif
-
-// For compilers that support precompilation, includes &quot;wx/wx.h&quot;.
-#include &quot;wx/wxprec.h&quot;
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#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>
-    <string name="resource_class_name">"AppResources"</string>
-    <string name="app_file_header">"app.h"</string>
-    <string name="app_file_implementation">"app.cpp"</string>
-    <string name="app_class_name">"Application"</string>
-    <bool name="generate_app_class">0</bool>
-    <string name="external_symbol_filenames">""</string>
-    <string name="configuration">"&lt;None&gt;"</string>
-    <string name="source_encoding">"&lt;System&gt;"</string>
-    <string name="xrc_encoding">"utf-8"</string>
-    <string name="project_encoding">"&lt;System&gt;"</string>
-    <string name="resource_archive">""</string>
-    <long name="text_file_type">0</long>
-    <bool name="use_tabs">0</bool>
-    <long name="indent_size">4</long>
-    <string name="whitespace_after_return_type">" "</string>
-    <string name="resource_xrc_cpp">""</string>
-    <bool name="use_resource_archive">0</bool>
-    <bool name="use_generated_xrc_cpp">0</bool>
-    <bool name="always_generate_xrc">1</bool>
-    <bool name="use_id_name_for_name">0</bool>
-    <bool name="archive_xrc_files">1</bool>
-    <bool name="archive_image_files">1</bool>
-    <bool name="archive_all_image_files">0</bool>
-    <bool name="xrc_retain_relative_paths">1</bool>
-    <bool name="xrc_generate_id_tags">0</bool>
-    <bool name="xrc_use_name_property">0</bool>
-  </header>
-  <data>
-    <document>
-      <string name="title">""</string>
-      <string name="type">"data-document"</string>
-      <string name="filename">""</string>
-      <string name="icon-name">""</string>
-      <long name="is-transient">0</long>
-      <long name="owns-file">1</long>
-      <long name="title-mode">0</long>
-      <long name="locked">0</long>
-      <document>
-        <string name="title">"Configurations"</string>
-        <string name="type">"config-data-document"</string>
-        <string name="filename">""</string>
-        <string name="icon-name">""</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="template-name">""</string>
-        <bool name="dirty">1</bool>
-        <long name="makefile-last-written">-8519680</long>
-        <string name="Compiler name">""</string>
-        <string name="Build mode">"Debug"</string>
-        <string name="Unicode mode">"ANSI"</string>
-        <string name="Shared mode">"Static"</string>
-        <string name="Modularity">"Modular"</string>
-        <string name="GUI mode">"GUI"</string>
-        <string name="Toolkit">"wxMSW"</string>
-        <string name="Runtime linking">"Dynamic"</string>
-        <string name="Use exceptions">"Yes"</string>
-        <string name="Use ODBC">"No"</string>
-        <string name="Use OpenGL">"No"</string>
-        <string name="wxWidgets version">"%WXVERSION%"</string>
-        <string name="Executable name">"%EXECUTABLE%"</string>
-        <string name="Program arguments">""</string>
-        <string name="Working path">"%AUTO%"</string>
-        <string name="Output path">"%AUTO%"</string>
-        <string name="Objects path">"%AUTO%"</string>
-        <string name="Compiler location">"%AUTO%"</string>
-        <string name="wxWidgets location">"%AUTO%"</string>
-        <string name="C++ command">"%AUTO%"</string>
-        <string name="C command">"%AUTO%"</string>
-        <string name="Resource compiler">"%AUTO%"</string>
-        <string name="Make command">"%AUTO%"</string>
-        <string name="Project makefile">"%AUTO%"</string>
-        <string name="wxWidgets makefile">"%AUTO%"</string>
-        <string name="Compiler bin path">"%AUTO%"</string>
-        <string name="Compiler include path">"%AUTO%"</string>
-        <string name="Compiler lib path">"%AUTO%"</string>
-        <string name="Preprocessor flags">"%AUTO%"</string>
-        <string name="Optimizations">"%AUTO%"</string>
-        <string name="Warnings">"%AUTO%"</string>
-        <string name="Debug flags">"%AUTO%"</string>
-        <string name="Extra compile flags">"%AUTO%"</string>
-        <string name="Libraries">"%AUTO%"</string>
-        <string name="Library path">"%AUTO%"</string>
-        <string name="Linker flags">"%AUTO%"</string>
-        <string name="Include path">"%AUTO%"</string>
-        <string name="Resource flags">"%AUTO%"</string>
-        <string name="Resource path">"%AUTO%"</string>
-        <string name="wxWidgets build path">"%AUTO%"</string>
-        <string name="wxWidgets build command">"%AUTO%"</string>
-        <string name="wxWidgets clean command">"%AUTO%"</string>
-        <string name="PATH variable">"%AUTO%"</string>
-        <bool name="Suppress source rules">0</bool>
-        <bool name="Enable makefile generation">1</bool>
-        <string name="CFG">""</string>
-      </document>
-    </document>
-  </data>
-
-  <documents>
-    <document>
-      <string name="title">"Projects"</string>
-      <string name="type">"root-document"</string>
-      <string name="filename">""</string>
-      <string name="icon-name">"project"</string>
-      <long name="is-transient">1</long>
-      <long name="owns-file">1</long>
-      <long name="title-mode">0</long>
-      <long name="locked">1</long>
-      <document>
-        <string name="title">"Windows"</string>
-        <string name="type">"html-document"</string>
-        <string name="filename">""</string>
-        <string name="icon-name">"dialogsfolder"</string>
-        <long name="is-transient">1</long>
-        <long name="owns-file">1</long>
-        <long name="title-mode">0</long>
-        <long name="locked">1</long>
-        <document>
-          <string name="title">"Lib Component Properties"</string>
-          <string name="type">"dialog-document"</string>
-          <string name="filename">""</string>
-          <string name="icon-name">"dialog"</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">"2/8/2006"</string>
-          <string name="proxy-type">"wbDialogProxy"</string>
-          <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_PartPropertiesFrame"</string>
-          <string name="proxy-Base class">"wxDialog"</string>
-          <string name="proxy-Window kind">"wxDialog"</string>
-          <string name="proxy-Implementation filename">"dialog_edit_component_in_lib.cpp"</string>
-          <string name="proxy-Header filename">"dialog_edit_component_in_lib.h"</string>
-          <string name="proxy-XRC filename">""</string>
-          <string name="proxy-Title">"Lib Component Properties"</string>
-          <bool name="proxy-Centre">1</bool>
-          <string name="proxy-Icon">""</string>
-          <bool name="proxy-Dialog units">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">""</string>
-          <string name="proxy-Font">""</string>
-          <bool name="proxy-Hidden">0</bool>
-          <bool name="proxy-Enabled">1</bool>
-          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-          <string name="proxy-Data source">""</string>
-          <string name="proxy-Data class name">""</string>
-          <string name="proxy-Data class implementation filename">""</string>
-          <string name="proxy-Data class header filename">""</string>
-          <string name="proxy-Data class manager window">""</string>
-          <string name="proxy-Texture">""</string>
-          <string name="proxy-Texture style">"Tiled"</string>
-          <bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
-          <bool name="proxy-wxCAPTION">1</bool>
-          <bool name="proxy-wxRESIZE_BORDER">0</bool>
-          <bool name="proxy-wxSYSTEM_MENU">1</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-wxMAXIMIZE_BOX">0</bool>
-          <bool name="proxy-wxMINIMIZE_BOX">0</bool>
-          <bool name="proxy-wxDIALOG_MODAL">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>
-          <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>
-          <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>
-            <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="proxy-type">"wbBoxSizerProxy"</string>
-            <string name="proxy-Orientation">"Vertical"</string>
-            <string name="proxy-Member variable name">"m_GeneralBoxSizer"</string>
-            <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">"wxNotebook: ID_LIBEDIT_NOTEBOOK"</string>
-              <string name="type">"dialog-control-document"</string>
-              <string name="filename">""</string>
-              <string name="icon-name">"notebook"</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">"2/8/2006"</string>
-              <string name="proxy-type">"wbNotebookProxy"</string>
-              <string name="proxy-Id name">"ID_LIBEDIT_NOTEBOOK"</string>
-              <long name="proxy-Id value">10001</long>
-              <string name="proxy-Name">""</string>
-              <string name="proxy-Class">"wxNotebook"</string>
-              <string name="proxy-Base class">"wxNotebook"</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_NoteBook"</string>
-              <bool name="proxy-Notebook sizer">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">""</string>
-              <string name="proxy-Font">""</string>
-              <bool name="proxy-Hidden">0</bool>
-              <bool name="proxy-Enabled">1</bool>
-              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-              <string name="proxy-Data variable">""</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-wxNB_DEFAULT">1</bool>
-              <bool name="proxy-wxNB_TOP">1</bool>
-              <bool name="proxy-wxNB_BOTTOM">0</bool>
-              <bool name="proxy-wxNB_LEFT">0</bool>
-              <bool name="proxy-wxNB_RIGHT">0</bool>
-              <bool name="proxy-wxNB_FIXEDWIDTH">0</bool>
-              <bool name="proxy-wxNB_MULTILINE">0</bool>
-              <bool name="proxy-wxNB_NOPAGETHEME">0</bool>
-              <bool name="proxy-wxNB_FLAT">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>
-              <bool name="proxy-wxCLIP_CHILDREN">0</bool>
-              <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">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>
-              <bool name="proxy-wxCLIP_CHILDREN ">0</bool>
-              <document>
-                <string name="title">"wxPanel: ID_PANEL_BASIC"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"panel"</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">"2/8/2006"</string>
-                <string name="proxy-type">"wbPanelProxy"</string>
-                <string name="proxy-Id name">"ID_PANEL_BASIC"</string>
-                <long name="proxy-Id value">10002</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxPanel"</string>
-                <string name="proxy-Base class">"wxPanel"</string>
-                <bool name="proxy-External implementation">0</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_PanelBasic"</string>
-                <string name="proxy-Tab label">"Options"</string>
-                <string name="proxy-Tab icon">""</string>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data 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-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                <bool name="proxy-wxSUNKEN_BORDER">1</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>
-                <bool name="proxy-wxCLIP_CHILDREN">0</bool>
-                <bool name="proxy-wxHSCROLL">0</bool>
-                <bool name="proxy-wxVSCROLL">0</bool>
-                <bool name="proxy-wxTAB_TRAVERSAL">1</bool>
-                <bool name="proxy-wxALWAYS_SHOW_SB">0</bool>
-                <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
-                <bool name="proxy-wxWS_EX_BLOCK_EVENTS">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <bool name="proxy-Fit to content">1</bool>
-                <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>
-                <string name="proxy-Event sources">""</string>
-                <bool name="proxy-AUI manager">0</bool>
-                <document>
-                  <string name="title">"wxBoxSizer V"</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">"2/8/2006"</string>
-                  <string name="proxy-type">"wbBoxSizerProxy"</string>
-                  <string name="proxy-Orientation">"Vertical"</string>
-                  <string name="proxy-Member variable name">"m_PanelBasicBoxSizer"</string>
-                  <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-Platform">"&lt;Any platform&gt;"</string>
-                  <document>
-                    <string name="title">"wxStaticBoxSizer V"</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">"2/8/2006"</string>
-                    <string name="proxy-type">"wbStaticBoxSizerProxy"</string>
-                    <string name="proxy-Id name">"wxID_ANY"</string>
-                    <long name="proxy-Id value">-1</long>
-                    <string name="proxy-Label">"General :"</string>
-                    <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Sizer member variable name">"m_OptionsBoxSizer"</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Static box class">"wxStaticBox"</string>
-                    <string name="proxy-Orientation">"Vertical"</string>
-                    <string name="proxy-AlignH">"Left"</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-Platform">"&lt;Any platform&gt;"</string>
-                  </document>
-                  <document>
-                    <string name="title">"wxBoxSizer H"</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">"2/8/2006"</string>
-                    <string name="proxy-type">"wbBoxSizerProxy"</string>
-                    <string name="proxy-Orientation">"Horizontal"</string>
-                    <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-AlignH">"Left"</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-Platform">"&lt;Any platform&gt;"</string>
-                    <document>
-                      <string name="title">"wxBoxSizer V"</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">"2/8/2006"</string>
-                      <string name="proxy-type">"wbBoxSizerProxy"</string>
-                      <string name="proxy-Orientation">"Vertical"</string>
-                      <string name="proxy-Member variable name">""</string>
-                      <string name="proxy-AlignH">"Centre"</string>
-                      <string name="proxy-AlignV">"Centre"</string>
-                      <long name="proxy-Stretch factor">0</long>
-                      <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-Platform">"&lt;Any platform&gt;"</string>
-                      <document>
-                        <string name="title">"wxStaticText: wxID_STATIC"</string>
-                        <string name="type">"dialog-control-document"</string>
-                        <string name="filename">""</string>
-                        <string name="icon-name">"statictext"</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">"2/8/2006"</string>
-                        <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>
-                        <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">"Number of Units:"</string>
-                        <long name="proxy-Wrapping width">-1</long>
-                        <string name="proxy-Help text">""</string>
-                        <string name="proxy-Tooltip text">""</string>
-                        <string name="proxy-Background colour">""</string>
-                        <string name="proxy-Foreground colour">""</string>
-                        <string name="proxy-Font">""</string>
-                        <bool name="proxy-Hidden">0</bool>
-                        <bool name="proxy-Enabled">1</bool>
-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <string name="proxy-Data variable">""</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-wxALIGN_LEFT">0</bool>
-                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                        <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                        <bool name="proxy-wxST_NO_AUTORESIZE">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">1</bool>
-                        <bool name="proxy-wxBOTTOM">0</bool>
-                        <bool name="proxy-wxSHAPED">0</bool>
-                        <bool name="proxy-wxADJUST_MINSIZE">1</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">"wxSpinCtrl: ID_SPINCTRL1"</string>
-                        <string name="type">"dialog-control-document"</string>
-                        <string name="filename">""</string>
-                        <string name="icon-name">"spinctrl"</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">"2/8/2006"</string>
-                        <string name="proxy-type">"wbSpinCtrlProxy"</string>
-                        <string name="proxy-Id name">"ID_SPINCTRL1"</string>
-                        <long name="proxy-Id value">10010</long>
-                        <string name="proxy-Name">""</string>
-                        <string name="proxy-Class">"wxSpinCtrl"</string>
-                        <string name="proxy-Base class">"wxSpinCtrl"</string>
-                        <bool name="proxy-External implementation">1</bool>
-                        <bool name="proxy-Separate files">0</bool>
-                        <string name="proxy-Implementation filename">""</string>
-                        <string name="proxy-Header filename">""</string>
-                        <string name="proxy-Member variable name">"SelNumberOfUnits"</string>
-                        <long name="proxy-Minimum value">1</long>
-                        <long name="proxy-Maximum value">16</long>
-                        <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>
-                        <string name="proxy-Foreground colour">""</string>
-                        <string name="proxy-Font">""</string>
-                        <bool name="proxy-Hidden">0</bool>
-                        <bool name="proxy-Enabled">1</bool>
-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <string name="proxy-Data variable">""</string>
-                        <string name="proxy-Data validator">""</string>
-                        <string name="proxy-Data source">""</string>
-                        <string name="proxy-Data class name">""</string>
-                        <string name="proxy-Data class implementation filename">""</string>
-                        <string name="proxy-Data class header filename">""</string>
-                        <string name="proxy-Data class manager window">""</string>
-                        <bool name="proxy-wxSP_ARROW_KEYS">1</bool>
-                        <bool name="proxy-wxSP_WRAP">0</bool>
-                        <bool name="proxy-wxNO_BORDER">0</bool>
-                        <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">"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">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>
-                        <string name="proxy-Custom arguments">""</string>
-                        <string name="proxy-Custom ctor arguments">""</string>
-                      </document>
-                    </document>
-                    <document>
-                      <string name="title">"wxBoxSizer V"</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">"2/8/2006"</string>
-                      <string name="proxy-type">"wbBoxSizerProxy"</string>
-                      <string name="proxy-Orientation">"Vertical"</string>
-                      <string name="proxy-Member variable name">""</string>
-                      <string name="proxy-AlignH">"Centre"</string>
-                      <string name="proxy-AlignV">"Centre"</string>
-                      <long name="proxy-Stretch factor">0</long>
-                      <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-Platform">"&lt;Any platform&gt;"</string>
-                      <document>
-                        <string name="title">"wxStaticText: wxID_STATIC"</string>
-                        <string name="type">"dialog-control-document"</string>
-                        <string name="filename">""</string>
-                        <string name="icon-name">"statictext"</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">"2/8/2006"</string>
-                        <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>
-                        <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">"Skew:"</string>
-                        <long name="proxy-Wrapping width">-1</long>
-                        <string name="proxy-Help text">""</string>
-                        <string name="proxy-Tooltip text">""</string>
-                        <string name="proxy-Background colour">""</string>
-                        <string name="proxy-Foreground colour">""</string>
-                        <string name="proxy-Font">""</string>
-                        <bool name="proxy-Hidden">0</bool>
-                        <bool name="proxy-Enabled">1</bool>
-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <string name="proxy-Data variable">""</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-wxALIGN_LEFT">0</bool>
-                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                        <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                        <bool name="proxy-wxST_NO_AUTORESIZE">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">1</bool>
-                        <bool name="proxy-wxBOTTOM">0</bool>
-                        <bool name="proxy-wxSHAPED">0</bool>
-                        <bool name="proxy-wxADJUST_MINSIZE">1</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">"wxSpinCtrl: ID_SPINCTRL"</string>
-                        <string name="type">"dialog-control-document"</string>
-                        <string name="filename">""</string>
-                        <string name="icon-name">"spinctrl"</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">"2/8/2006"</string>
-                        <string name="proxy-type">"wbSpinCtrlProxy"</string>
-                        <string name="proxy-Id name">"ID_SPINCTRL"</string>
-                        <long name="proxy-Id value">10009</long>
-                        <string name="proxy-Name">""</string>
-                        <string name="proxy-Class">"wxSpinCtrl"</string>
-                        <string name="proxy-Base class">"wxSpinCtrl"</string>
-                        <bool name="proxy-External implementation">1</bool>
-                        <bool name="proxy-Separate files">0</bool>
-                        <string name="proxy-Implementation filename">""</string>
-                        <string name="proxy-Header filename">""</string>
-                        <string name="proxy-Member variable name">"m_SetSkew"</string>
-                        <long name="proxy-Minimum value">0</long>
-                        <long name="proxy-Maximum value">100</long>
-                        <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>
-                        <string name="proxy-Foreground colour">""</string>
-                        <string name="proxy-Font">""</string>
-                        <bool name="proxy-Hidden">0</bool>
-                        <bool name="proxy-Enabled">1</bool>
-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <string name="proxy-Data variable">""</string>
-                        <string name="proxy-Data validator">""</string>
-                        <string name="proxy-Data source">""</string>
-                        <string name="proxy-Data class name">""</string>
-                        <string name="proxy-Data class implementation filename">""</string>
-                        <string name="proxy-Data class header filename">""</string>
-                        <string name="proxy-Data class manager window">""</string>
-                        <bool name="proxy-wxSP_ARROW_KEYS">1</bool>
-                        <bool name="proxy-wxSP_WRAP">0</bool>
-                        <bool name="proxy-wxNO_BORDER">0</bool>
-                        <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">"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">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>
-                        <string name="proxy-Custom arguments">""</string>
-                        <string name="proxy-Custom ctor arguments">""</string>
-                      </document>
-                    </document>
-                  </document>
-                  <document>
-                    <string name="title">"wxCheckBox: ID_CHECKBOX"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"checkbox"</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">"2/8/2006"</string>
-                    <string name="proxy-type">"wbCheckBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_CHECKBOX"</string>
-                    <long name="proxy-Id value">10007</long>
-                    <string name="proxy-Name">""</string>
-                    <string name="proxy-Class">"wxCheckBox"</string>
-                    <string name="proxy-Base class">"wxCheckBox"</string>
-                    <bool name="proxy-External implementation">1</bool>
-                    <bool name="proxy-Separate files">0</bool>
-                    <string name="proxy-Implementation filename">""</string>
-                    <string name="proxy-Header filename">""</string>
-                    <string name="proxy-Member variable name">"m_OptionPower"</string>
-                    <string name="proxy-Label">"Power Symbol"</string>
-                    <bool name="proxy-Initial value">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-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxCHK_2STATE">1</bool>
-                    <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>
-                    <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">"wxCheckBox: ID_CHECKBOX1"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"checkbox"</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">"2/8/2006"</string>
-                    <string name="proxy-type">"wbCheckBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_CHECKBOX1"</string>
-                    <long name="proxy-Id value">10008</long>
-                    <string name="proxy-Name">""</string>
-                    <string name="proxy-Class">"wxCheckBox"</string>
-                    <string name="proxy-Base class">"wxCheckBox"</string>
-                    <bool name="proxy-External implementation">1</bool>
-                    <bool name="proxy-Separate files">0</bool>
-                    <string name="proxy-Implementation filename">""</string>
-                    <string name="proxy-Header filename">""</string>
-                    <string name="proxy-Member variable name">"m_OptionPartsLocked"</string>
-                    <string name="proxy-Label">"Parts are locked"</string>
-                    <bool name="proxy-Initial value">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-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxCHK_2STATE">1</bool>
-                    <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>
-                    <long name="proxy-Width">-1</long>
-                    <long name="proxy-Height">-1</long>
-                    <string name="proxy-AlignH">"Expand"</string>
-                    <string name="proxy-AlignV">"Centre"</string>
-                    <long name="proxy-Stretch factor">0</long>
-                    <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                    <string name="proxy-Custom arguments">""</string>
-                    <string name="proxy-Custom ctor arguments">""</string>
-                  </document>
-                </document>
-              </document>
-              <document>
-                <string name="title">"wxPanel: ID_PANEL_DOC"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"panel"</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">"2/8/2006"</string>
-                <string name="proxy-type">"wbPanelProxy"</string>
-                <string name="proxy-Id name">"ID_PANEL_DOC"</string>
-                <long name="proxy-Id value">10004</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxPanel"</string>
-                <string name="proxy-Base class">"wxPanel"</string>
-                <bool name="proxy-External implementation">0</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_PanelDoc"</string>
-                <string name="proxy-Tab label">"Description"</string>
-                <string name="proxy-Tab icon">""</string>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data 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-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                <bool name="proxy-wxSUNKEN_BORDER">1</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>
-                <bool name="proxy-wxCLIP_CHILDREN">0</bool>
-                <bool name="proxy-wxHSCROLL">0</bool>
-                <bool name="proxy-wxVSCROLL">0</bool>
-                <bool name="proxy-wxTAB_TRAVERSAL">1</bool>
-                <bool name="proxy-wxALWAYS_SHOW_SB">0</bool>
-                <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
-                <bool name="proxy-wxWS_EX_BLOCK_EVENTS">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <bool name="proxy-Fit to content">1</bool>
-                <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>
-                <string name="proxy-Event sources">""</string>
-                <bool name="proxy-AUI manager">0</bool>
-                <document>
-                  <string name="title">"wxBoxSizer V"</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">"2/8/2006"</string>
-                  <string name="proxy-type">"wbBoxSizerProxy"</string>
-                  <string name="proxy-Orientation">"Vertical"</string>
-                  <string name="proxy-Member variable name">"m_PanelDocBoxSizer"</string>
-                  <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-Platform">"&lt;Any platform&gt;"</string>
-                  <document>
-                    <string name="title">"wxStaticText: wxID_STATIC"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"statictext"</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">"2/8/2006"</string>
-                    <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>
-                    <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">"Description:"</string>
-                    <long name="proxy-Wrapping width">-1</long>
-                    <string name="proxy-Help text">""</string>
-                    <string name="proxy-Tooltip text">""</string>
-                    <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</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-wxALIGN_LEFT">0</bool>
-                    <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                    <bool name="proxy-wxST_NO_AUTORESIZE">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">1</bool>
-                    <bool name="proxy-wxBOTTOM">0</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">1</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">"wxTextCtrl: ID_TEXTCTRL"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"textctrl"</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">"2/8/2006"</string>
-                    <string name="proxy-type">"wbTextCtrlProxy"</string>
-                    <string name="proxy-Id name">"ID_TEXTCTRL"</string>
-                    <long name="proxy-Id value">10011</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>
-                    <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_Doc"</string>
-                    <string name="proxy-Initial value">""</string>
-                    <long name="proxy-Max length">0</long>
-                    <string name="proxy-Help text">""</string>
-                    <string name="proxy-Tooltip text">""</string>
-                    <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</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">0</bool>
-                    <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                    <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                    <bool name="proxy-wxTE_PASSWORD">0</bool>
-                    <bool name="proxy-wxTE_READONLY">0</bool>
-                    <bool name="proxy-wxTE_RICH">0</bool>
-                    <bool name="proxy-wxTE_RICH2">0</bool>
-                    <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                    <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                    <bool name="proxy-wxTE_LEFT">0</bool>
-                    <bool name="proxy-wxTE_CENTRE">0</bool>
-                    <bool name="proxy-wxTE_RIGHT">0</bool>
-                    <bool name="proxy-wxHSCROLL">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>
-                    <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">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>
-                    <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                  </document>
-                  <document>
-                    <string name="title">"wxStaticText: wxID_STATIC"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"statictext"</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">"2/8/2006"</string>
-                    <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>
-                    <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">"Keywords:"</string>
-                    <long name="proxy-Wrapping width">-1</long>
-                    <string name="proxy-Help text">""</string>
-                    <string name="proxy-Tooltip text">""</string>
-                    <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</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-wxALIGN_LEFT">0</bool>
-                    <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                    <bool name="proxy-wxST_NO_AUTORESIZE">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">1</bool>
-                    <bool name="proxy-wxBOTTOM">0</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">1</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">"wxTextCtrl: ID_TEXTCTRL1"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"textctrl"</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">"2/8/2006"</string>
-                    <string name="proxy-type">"wbTextCtrlProxy"</string>
-                    <string name="proxy-Id name">"ID_TEXTCTRL1"</string>
-                    <long name="proxy-Id value">10012</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>
-                    <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_Keywords"</string>
-                    <string name="proxy-Initial value">""</string>
-                    <long name="proxy-Max length">0</long>
-                    <string name="proxy-Help text">""</string>
-                    <string name="proxy-Tooltip text">""</string>
-                    <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</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">0</bool>
-                    <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                    <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                    <bool name="proxy-wxTE_PASSWORD">0</bool>
-                    <bool name="proxy-wxTE_READONLY">0</bool>
-                    <bool name="proxy-wxTE_RICH">0</bool>
-                    <bool name="proxy-wxTE_RICH2">0</bool>
-                    <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                    <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                    <bool name="proxy-wxTE_LEFT">0</bool>
-                    <bool name="proxy-wxTE_CENTRE">0</bool>
-                    <bool name="proxy-wxTE_RIGHT">0</bool>
-                    <bool name="proxy-wxHSCROLL">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>
-                    <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">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>
-                    <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                  </document>
-                  <document>
-                    <string name="title">"wxStaticText: wxID_STATIC"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"statictext"</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">"2/8/2006"</string>
-                    <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>
-                    <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">"DocFileName:"</string>
-                    <long name="proxy-Wrapping width">-1</long>
-                    <string name="proxy-Help text">""</string>
-                    <string name="proxy-Tooltip text">""</string>
-                    <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</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-wxALIGN_LEFT">0</bool>
-                    <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                    <bool name="proxy-wxST_NO_AUTORESIZE">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">1</bool>
-                    <bool name="proxy-wxBOTTOM">0</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">1</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">"wxTextCtrl: ID_TEXTCTRL2"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"textctrl"</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">"2/8/2006"</string>
-                    <string name="proxy-type">"wbTextCtrlProxy"</string>
-                    <string name="proxy-Id name">"ID_TEXTCTRL2"</string>
-                    <long name="proxy-Id value">10013</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>
-                    <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_Docfile"</string>
-                    <string name="proxy-Initial value">""</string>
-                    <long name="proxy-Max length">0</long>
-                    <string name="proxy-Help text">""</string>
-                    <string name="proxy-Tooltip text">""</string>
-                    <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</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">0</bool>
-                    <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                    <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                    <bool name="proxy-wxTE_PASSWORD">0</bool>
-                    <bool name="proxy-wxTE_READONLY">0</bool>
-                    <bool name="proxy-wxTE_RICH">0</bool>
-                    <bool name="proxy-wxTE_RICH2">0</bool>
-                    <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                    <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                    <bool name="proxy-wxTE_LEFT">0</bool>
-                    <bool name="proxy-wxTE_CENTRE">0</bool>
-                    <bool name="proxy-wxTE_RIGHT">0</bool>
-                    <bool name="proxy-wxHSCROLL">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>
-                    <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">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>
-                    <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                  </document>
-                  <document>
-                    <string name="title">"wxBoxSizer H"</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">"2/8/2006"</string>
-                    <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-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-Platform">"&lt;Any platform&gt;"</string>
-                    <document>
-                      <string name="title">"wxButton: ID_COPY_DOC_TO_ALIAS"</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">"2/8/2006"</string>
-                      <string name="proxy-type">"wbButtonProxy"</string>
-                      <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCopyDocToAliasClick"</string>
-                      <string name="proxy-Id name">"ID_COPY_DOC_TO_ALIAS"</string>
-                      <long name="proxy-Id value">10014</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">"m_ButtonCopyDoc"</string>
-                      <string name="proxy-Label">"Copy Doc"</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">"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: ID_BROWSE_DOC_FILES"</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">"2/6/2006"</string>
-                      <string name="proxy-type">"wbButtonProxy"</string>
-                      <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnBrowseDocFilesClick"</string>
-                      <string name="proxy-Id name">"ID_BROWSE_DOC_FILES"</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>
-                      <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">"Browse DocFiles"</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">"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>
-                <string name="title">"wxPanel: ID_PANEL_ALIAS"</string>
-                <string name="type">"dialog-control-document"</string>
-                <string name="filename">""</string>
-                <string name="icon-name">"panel"</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">"2/8/2006"</string>
-                <string name="proxy-type">"wbPanelProxy"</string>
-                <string name="proxy-Id name">"ID_PANEL_ALIAS"</string>
-                <long name="proxy-Id value">10003</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxPanel"</string>
-                <string name="proxy-Base class">"wxPanel"</string>
-                <bool name="proxy-External implementation">0</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_PanelAlias"</string>
-                <string name="proxy-Tab label">"Alias"</string>
-                <string name="proxy-Tab icon">""</string>
-                <string name="proxy-Help text">""</string>
-                <string name="proxy-Tooltip text">""</string>
-                <string name="proxy-Background colour">""</string>
-                <string name="proxy-Foreground colour">""</string>
-                <string name="proxy-Font">""</string>
-                <bool name="proxy-Hidden">0</bool>
-                <bool name="proxy-Enabled">1</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <string name="proxy-Data 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-wxNO_BORDER">0</bool>
-                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                <bool name="proxy-wxSUNKEN_BORDER">1</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>
-                <bool name="proxy-wxCLIP_CHILDREN">0</bool>
-                <bool name="proxy-wxHSCROLL">0</bool>
-                <bool name="proxy-wxVSCROLL">0</bool>
-                <bool name="proxy-wxTAB_TRAVERSAL">1</bool>
-                <bool name="proxy-wxALWAYS_SHOW_SB">0</bool>
-                <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
-                <bool name="proxy-wxWS_EX_BLOCK_EVENTS">0</bool>
-                <string name="proxy-Custom styles">""</string>
-                <bool name="proxy-Fit to content">1</bool>
-                <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>
-                <string name="proxy-Event sources">""</string>
-                <bool name="proxy-AUI manager">0</bool>
-              </document>
-            </document>
-            <document>
-              <string name="title">"wxBoxSizer H"</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">"2/8/2006"</string>
-              <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-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-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">0</long>
-                <string name="created">"2/8/2006"</string>
-                <string name="proxy-type">"wbButtonProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick"</string>
-                <string name="proxy-Id name">"wxID_CANCEL"</string>
-                <long name="proxy-Id value">5101</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxButton"</string>
-                <string name="proxy-Base class">"wxButton"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">"m_btClose"</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">""</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_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">0</long>
-                <string name="created">"2/8/2006"</string>
-                <string name="proxy-type">"wbButtonProxy"</string>
-                <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick"</string>
-                <string name="proxy-Id name">"wxID_OK"</string>
-                <long name="proxy-Id value">5100</long>
-                <string name="proxy-Name">""</string>
-                <string name="proxy-Class">"wxButton"</string>
-                <string name="proxy-Base class">"wxButton"</string>
-                <bool name="proxy-External implementation">1</bool>
-                <bool name="proxy-Separate files">0</bool>
-                <string name="proxy-Implementation filename">""</string>
-                <string name="proxy-Header filename">""</string>
-                <string name="proxy-Member variable name">""</string>
-                <string name="proxy-Label">"&amp;OK"</string>
-                <bool name="proxy-Default">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">""</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>
-      <document>
-        <string name="title">"Sources"</string>
-        <string name="type">"html-document"</string>
-        <string name="filename">""</string>
-        <string name="icon-name">"sourcesfolder"</string>
-        <long name="is-transient">1</long>
-        <long name="owns-file">1</long>
-        <long name="title-mode">0</long>
-        <long name="locked">1</long>
-        <document>
-          <string name="title">"dialog_edit_component_in_lib.rc"</string>
-          <string name="type">"source-editor-document"</string>
-          <string name="filename">"dialog_edit_component_in_lib.rc"</string>
-          <string name="icon-name">"source-editor"</string>
-          <long name="is-transient">0</long>
-          <long name="owns-file">0</long>
-          <long name="title-mode">1</long>
-          <long name="locked">0</long>
-          <string name="created">"2/8/2006"</string>
-          <string name="language">""</string>
-        </document>
-      </document>
-      <document>
-        <string name="title">"Images"</string>
-        <string name="type">"html-document"</string>
-        <string name="filename">""</string>
-        <string name="icon-name">"bitmapsfolder"</string>
-        <long name="is-transient">1</long>
-        <long name="owns-file">1</long>
-        <long name="title-mode">0</long>
-        <long name="locked">1</long>
-      </document>
-    </document>
-  </documents>
-
-</anthemion-project>
diff --git a/eeschema/dialog_edit_component_in_lib_base.cpp b/eeschema/dialog_edit_component_in_lib_base.cpp
index 2b51efa80e..919f89e22b 100644
--- a/eeschema/dialog_edit_component_in_lib_base.cpp
+++ b/eeschema/dialog_edit_component_in_lib_base.cpp
@@ -161,10 +161,10 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	bRightBoxSizerPanelAlias = new wxBoxSizer( wxVERTICAL );
 	
 	m_ButtonAddeAlias = new wxButton( m_PanelAlias, ID_ADD_ALIAS, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
-	bRightBoxSizerPanelAlias->Add( m_ButtonAddeAlias, 0, wxALL, 5 );
+	bRightBoxSizerPanelAlias->Add( m_ButtonAddeAlias, 0, wxALL|wxEXPAND, 5 );
 	
 	m_ButtonDeleteOneAlias = new wxButton( m_PanelAlias, ID_DELETE_ONE_ALIAS, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
-	bRightBoxSizerPanelAlias->Add( m_ButtonDeleteOneAlias, 0, wxALL, 5 );
+	bRightBoxSizerPanelAlias->Add( m_ButtonDeleteOneAlias, 0, wxALL|wxEXPAND, 5 );
 	
 	m_ButtonDeleteAllAlias = new wxButton( m_PanelAlias, ID_DELETE_ALL_ALIAS, _("Delete All"), wxDefaultPosition, wxDefaultSize, 0 );
 	bRightBoxSizerPanelAlias->Add( m_ButtonDeleteAllAlias, 0, wxALL, 5 );
@@ -195,13 +195,13 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	bFpFilterRightBoxSizer = new wxBoxSizer( wxVERTICAL );
 	
 	m_buttonAddFpF = new wxButton( m_PanelFootprintFilter, ID_ADD_FOOTPRINT_FILTER, _("Add"), wxDefaultPosition, wxDefaultSize, 0 );
-	bFpFilterRightBoxSizer->Add( m_buttonAddFpF, 0, wxALL, 5 );
+	bFpFilterRightBoxSizer->Add( m_buttonAddFpF, 0, wxALL|wxEXPAND, 5 );
 	
 	m_ButtonDeleteOneFootprintFilter = new wxButton( m_PanelFootprintFilter, ID_DELETE_ONE_FOOTPRINT_FILTER, _("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
-	bFpFilterRightBoxSizer->Add( m_ButtonDeleteOneFootprintFilter, 0, wxALL, 5 );
+	bFpFilterRightBoxSizer->Add( m_ButtonDeleteOneFootprintFilter, 0, wxALL|wxEXPAND, 5 );
 	
 	m_ButtonDeleteAllFootprintFilter = new wxButton( m_PanelFootprintFilter, ID_DELETE_ALL_FOOTPRINT_FILTER, _("Delete All"), wxDefaultPosition, wxDefaultSize, 0 );
-	bFpFilterRightBoxSizer->Add( m_ButtonDeleteAllFootprintFilter, 0, wxALL, 5 );
+	bFpFilterRightBoxSizer->Add( m_ButtonDeleteAllFootprintFilter, 0, wxALL|wxEXPAND, 5 );
 	
 	bPanelFpFilterBoxSizer->Add( bFpFilterRightBoxSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
 	
diff --git a/eeschema/dialog_edit_component_in_lib_base.fbp b/eeschema/dialog_edit_component_in_lib_base.fbp
index 8aae1ef478..9a26b57f43 100644
--- a/eeschema/dialog_edit_component_in_lib_base.fbp
+++ b/eeschema/dialog_edit_component_in_lib_base.fbp
@@ -1511,7 +1511,7 @@
                                             <property name="permission">none</property>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxALL</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxButton" expanded="1">
                                                     <property name="bg"></property>
@@ -1563,7 +1563,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxALL</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxButton" expanded="1">
                                                     <property name="bg"></property>
@@ -1846,7 +1846,7 @@
                                             <property name="permission">none</property>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxALL</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxButton" expanded="1">
                                                     <property name="bg"></property>
@@ -1898,7 +1898,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxALL</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxButton" expanded="1">
                                                     <property name="bg"></property>
@@ -1950,7 +1950,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxALL</property>
+                                                <property name="flag">wxALL|wxEXPAND</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxButton" expanded="1">
                                                     <property name="bg"></property>
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 10d9468ae0..e13e95212e 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -45,7 +45,8 @@ BOARD::BOARD( EDA_BaseStruct* parent, WinEDA_BasePcbFrame* frame ) :
 /***************/
 BOARD::~BOARD()
 {
-    m_PcbFrame->GetScreen()->ClearUndoRedoList();
+    if( m_PcbFrame->GetScreen() )
+        m_PcbFrame->GetScreen()->ClearUndoRedoList();
 
     while( m_ZoneDescriptorList.size() )
     {