Commit a397c4b2 authored by CHARRAS's avatar CHARRAS
Browse files

gestfich.cpp change (A problem under windows already solved, but change was lost)

parent 75ce1923

common/gestfich.cpp

+13 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static wxString s_HelpPathList[] = { 
#ifdef __WINDOWS__

	wxT("c:/kicad/help/"),

	wxT("d:/kicad/help/"),

	wxT("c:/Program Files/kicad/help/"),

#else

	wxT("/usr/share/doc/kicad/"),

	wxT("/usr/local/share/doc/kicad/"),
@@ -52,6 +53,7 @@ static wxString s_KicadDataPathList[] = { 
#ifdef __WINDOWS__

	wxT("c:/kicad/"),

	wxT("d:/kicad/"),

	wxT("c:/Program Files/kicad/"),

#else

	wxT("/usr/share/kicad/"),

	wxT("/usr/local/share/kicad/"),
@@ -332,7 +334,11 @@ bool PathFound = FALSE; 
	FullPath += wxT("/help/");

	LocaleString = EDA_Appl->m_Locale->GetCanonicalName();



	if ( FullPath.Contains( wxT("kicad")) )

	wxString path_tmp = FullPath;

#ifdef __WINDOWS__

	path_tmp.MakeLower();

#endif

	if ( path_tmp.Contains( wxT("kicad")) )

	{

		if ( wxDirExists(FullPath) ) PathFound = TRUE;

	}
@@ -520,8 +526,14 @@ wxString data_path; 
	else 	// Chemin cherche par le chemin des executables

	{		// le chemin est bindir../

		wxString tmp = EDA_Appl->m_BinDir;

#ifdef __WINDOWS__

		tmp.MakeLower();

#endif

		if ( tmp.Contains( wxT("kicad") ) )

		{

#ifdef __WINDOWS__

			tmp = EDA_Appl->m_BinDir;

#endif

			if ( tmp.Last() == '/' ) tmp.RemoveLast();

			data_path = tmp.BeforeLast('/'); // id cd ../

			data_path += UNIX_STRING_DIR_SEP;

eeschema/annotate_dialog.cpp

+42 −39
Original line number Diff line number Diff line
@@ -82,15 +82,18 @@ bool WinEDA_AnnotateFrame::Create( wxWindow* parent, wxWindowID id, const wxStri 
////@begin WinEDA_AnnotateFrame member initialisation

    m_AnnotProjetCtrl = NULL;

    m_AnnotNewCmpCtrl = NULL;

    m_AnnotSortCmpCtrl = NULL;

////@end WinEDA_AnnotateFrame member initialisation



////@begin WinEDA_AnnotateFrame creation

    SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);

    SetExtraStyle(wxWS_EX_BLOCK_EVENTS);

    wxDialog::Create( parent, id, caption, pos, size, style );



    CreateControls();

    GetSizer()->Fit(this);

    if (GetSizer())

    {

        GetSizer()->SetSizeHints(this);

    }

    Centre();

////@end WinEDA_AnnotateFrame creation

    return true;
@@ -105,7 +108,7 @@ void WinEDA_AnnotateFrame::CreateControls() 
	SetFont(*g_DialogFont);



////@begin WinEDA_AnnotateFrame content construction

    // Generated by DialogBlocks, 05/02/2006 12:40:51 (unregistered)

    // Generated by DialogBlocks, 05/07/2007 21:07:04 (unregistered)



    WinEDA_AnnotateFrame* itemDialog1 = this;
@@ -115,41 +118,41 @@ void WinEDA_AnnotateFrame::CreateControls() 
    wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);

    itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);



    wxString m_AnnotProjetCtrlStrings[] = {

        _("Hierarchy"),

        _("Current sheet")

    };

    m_AnnotProjetCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("annotate:"), wxDefaultPosition, wxDefaultSize, 2, m_AnnotProjetCtrlStrings, 1, wxRA_SPECIFY_COLS );

    itemBoxSizer3->Add(m_AnnotProjetCtrl, 0, wxALIGN_LEFT|wxALL, 5);



    wxString m_AnnotNewCmpCtrlStrings[] = {

        _("all components"),

        _("new components only")

    };

    m_AnnotNewCmpCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("select items:"), wxDefaultPosition, wxDefaultSize, 2, m_AnnotNewCmpCtrlStrings, 1, wxRA_SPECIFY_COLS );

    itemBoxSizer3->Add(m_AnnotNewCmpCtrl, 0, wxALIGN_LEFT|wxALL, 5);



    wxString m_AnnotSortCmpCtrlStrings[] = {

        _("by position"),

        _("by value")

    };

    m_AnnotSortCmpCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("sorting:"), wxDefaultPosition, wxDefaultSize, 2, m_AnnotSortCmpCtrlStrings, 1, wxRA_SPECIFY_COLS );

    itemBoxSizer3->Add(m_AnnotSortCmpCtrl, 0, wxALIGN_LEFT|wxALL, 5);



    wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL);

    itemBoxSizer2->Add(itemBoxSizer6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);



    wxButton* itemButton7 = new wxButton( itemDialog1, ID_ANNOTATE_CMP, _("&Annotate"), wxDefaultPosition, wxDefaultSize, 0 );

    itemButton7->SetDefault();

    itemButton7->SetForegroundColour(wxColour(198, 0, 0));

    itemBoxSizer6->Add(itemButton7, 0, wxGROW|wxALL, 5);



    wxButton* itemButton8 = new wxButton( itemDialog1, ID_DEANNOTATE_CMP, _("&Del Annotate"), wxDefaultPosition, wxDefaultSize, 0 );

    itemButton8->SetForegroundColour(wxColour(0, 0, 230));

    itemBoxSizer6->Add(itemButton8, 0, wxGROW|wxALL, 5);



    wxButton* itemButton9 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );

    itemBoxSizer6->Add(itemButton9, 0, wxGROW|wxALL, 5);

    wxArrayString m_AnnotProjetCtrlStrings;

    m_AnnotProjetCtrlStrings.Add(_("Hierarchy"));

    m_AnnotProjetCtrlStrings.Add(_("Current sheet"));

    m_AnnotProjetCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("annotate:"), wxDefaultPosition, wxDefaultSize, m_AnnotProjetCtrlStrings, 1, wxRA_SPECIFY_COLS );

    m_AnnotProjetCtrl->SetSelection(0);

    itemBoxSizer3->Add(m_AnnotProjetCtrl, 0, wxGROW|wxALL, 5);



    wxArrayString m_AnnotNewCmpCtrlStrings;

    m_AnnotNewCmpCtrlStrings.Add(_("all components"));

    m_AnnotNewCmpCtrlStrings.Add(_("new components only"));

    m_AnnotNewCmpCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("select items:"), wxDefaultPosition, wxDefaultSize, m_AnnotNewCmpCtrlStrings, 1, wxRA_SPECIFY_COLS );

    m_AnnotNewCmpCtrl->SetSelection(0);

    itemBoxSizer3->Add(m_AnnotNewCmpCtrl, 0, wxGROW|wxALL, 5);



    wxArrayString m_AnnotSortCmpCtrlStrings;

    m_AnnotSortCmpCtrlStrings.Add(_("by position"));

    m_AnnotSortCmpCtrlStrings.Add(_("by value"));

    m_AnnotSortCmpCtrl = new wxRadioBox( itemDialog1, ID_RADIOBOX2, _("sorting:"), wxDefaultPosition, wxDefaultSize, m_AnnotSortCmpCtrlStrings, 1, wxRA_SPECIFY_COLS );

    m_AnnotSortCmpCtrl->SetSelection(0);

    itemBoxSizer3->Add(m_AnnotSortCmpCtrl, 0, wxGROW|wxALL, 5);



    wxBoxSizer* itemBoxSizer7 = new wxBoxSizer(wxVERTICAL);

    itemBoxSizer2->Add(itemBoxSizer7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);



    wxButton* itemButton8 = new wxButton( itemDialog1, ID_ANNOTATE_CMP, _("&Annotate"), wxDefaultPosition, wxDefaultSize, 0 );

    itemButton8->SetDefault();

    itemButton8->SetForegroundColour(wxColour(198, 0, 0));

    itemBoxSizer7->Add(itemButton8, 0, wxGROW|wxALL, 5);



    wxButton* itemButton9 = new wxButton( itemDialog1, ID_DEANNOTATE_CMP, _("&Del Annotate"), wxDefaultPosition, wxDefaultSize, 0 );

    itemButton9->SetForegroundColour(wxColour(0, 0, 230));

    itemBoxSizer7->Add(itemButton9, 0, wxGROW|wxALL, 5);



    wxButton* itemButton10 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );

    itemBoxSizer7->Add(itemButton10, 0, wxGROW|wxALL, 5);



////@end WinEDA_AnnotateFrame content construction

}

eeschema/annotate_dialog.h

+7 −7
Original line number Diff line number Diff line
@@ -44,16 +44,16 @@ 


////@begin control identifiers

#define ID_DIALOG 10000

#define ID_RADIOBOX 10001

#define ID_RADIOBOX1 10002

#define ID_RADIOBOX2 10005

#define ID_ANNOTATE_CMP 10003

#define ID_DEANNOTATE_CMP 10004

#define SYMBOL_WINEDA_ANNOTATEFRAME_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX

#define SYMBOL_WINEDA_ANNOTATEFRAME_TITLE _("EESchema Annotation")

#define SYMBOL_WINEDA_ANNOTATEFRAME_IDNAME ID_DIALOG

#define SYMBOL_WINEDA_ANNOTATEFRAME_SIZE wxSize(400, 500)

#define SYMBOL_WINEDA_ANNOTATEFRAME_SIZE wxSize(400, 300)

#define SYMBOL_WINEDA_ANNOTATEFRAME_POSITION wxDefaultPosition

#define ID_RADIOBOX 10001

#define ID_RADIOBOX1 10002

#define ID_RADIOBOX2 10003

#define ID_ANNOTATE_CMP 10004

#define ID_DEANNOTATE_CMP 10005

////@end control identifiers



/*!

eeschema/annotate_dialog.pjd

+167 −14
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="windows-1252"?>

<?xml version="1.0" encoding="UTF-8"?>

<anthemion-project version="1.0.0.0" xmlns="http://www.anthemion.co.uk">

  <header>

    <long name="name_counter">0</long>
@@ -6,7 +6,6 @@ 
    <string name="title">""</string>

    <string name="author">""</string>

    <string name="description">""</string>

    <long name="doc_count">16</long>

    <string name="xrc_filename">""</string>

    <bool name="convert_images_to_xpm">0</bool>

    <bool name="inline_images">0</bool>
@@ -18,6 +17,7 @@ 
    <string name="copyright_string">"License GNU"</string>

    <string name="resource_prefix">""</string>

    <bool name="use_two_step_construction">0</bool>

    <bool name="use_enums">0</bool>

    <string name="current_platform">"&lt;All platforms&gt;"</string>

    <string name="target_wx_version">"&lt;Any&gt;"</string>

    <string name="cpp_header_comment">"/////////////////////////////////////////////////////////////////////////////
@@ -43,12 +43,6 @@ 
// Licence:     

/////////////////////////////////////////////////////////////////////////////



"</string>

    <string name="cpp_function_comment">"

/*!

 * %BODY%

 */



"</string>

    <string name="cpp_symbols_file_comment">"/////////////////////////////////////////////////////////////////////////////

// Name:        %SYMBOLS-FILENAME%
@@ -82,6 +76,14 @@ 
#include &quot;wx/wx.h&quot;

#endif



"</string>

    <string name="cpp_function_declaration_comment">"	/// %BODY%

"</string>

    <string name="cpp_function_implementation_comment">"

/*!

 * %BODY%

 */



"</string>

    <string name="resource_file_header">"app_resources.h"</string>

    <string name="resource_file_implementation">"app_resources.cpp"</string>
@@ -93,11 +95,21 @@ 
    <string name="external_symbol_filenames">""</string>

    <string name="configuration">"&lt;None&gt;"</string>

    <string name="source_encoding">"&lt;System&gt;"</string>

    <string name="xrc_encoding">"utf-8"</string>

    <string name="project_encoding">"&lt;System&gt;"</string>

    <string name="resource_archive">""</string>

    <long name="text_file_type">0</long>

    <bool name="use_tabs">0</bool>

    <long name="indent_size">4</long>

    <string name="whitespace_after_return_type">" "</string>

    <string name="resource_xrc_cpp">""</string>

    <bool name="use_resource_archive">0</bool>

    <bool name="use_generated_xrc_cpp">0</bool>

    <bool name="always_generate_xrc">1</bool>

    <bool name="archive_xrc_files">1</bool>

    <bool name="archive_image_files">1</bool>

    <bool name="archive_all_image_files">0</bool>

    <bool name="xrc_retain_relative_paths">1</bool>

  </header>

  <data>

    <document>
@@ -120,6 +132,47 @@ 
        <long name="locked">0</long>

        <string name="template-name">""</string>

        <bool name="dirty">1</bool>

        <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="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="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>

      </document>

    </document>

  </data>
@@ -133,7 +186,7 @@ 
      <long name="is-transient">1</long>

      <long name="owns-file">1</long>

      <long name="title-mode">0</long>

      <long name="locked">0</long>

      <long name="locked">1</long>

      <document>

        <string name="title">"Windows"</string>

        <string name="type">"html-document"</string>
@@ -157,6 +210,8 @@ 
          <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>

          <string name="proxy-Id name">"ID_DIALOG"</string>

          <long name="proxy-Id value">10000</long>
@@ -196,6 +251,8 @@ 
          <bool name="proxy-wxRAISED_BORDER">0</bool>

          <bool name="proxy-wxSTATIC_BORDER">0</bool>

          <bool name="proxy-wxWANTS_CHARS">0</bool>

          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>

          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>

          <bool name="proxy-wxCLIP_CHILDREN">0</bool>

          <bool name="proxy-wxTAB_TRAVERSAL">0</bool>

          <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
@@ -208,6 +265,7 @@ 
          <long name="proxy-Y">-1</long>

          <long name="proxy-Width">400</long>

          <long name="proxy-Height">300</long>

          <bool name="proxy-AUI manager">0</bool>

          <string name="proxy-Event sources">""</string>

          <document>

            <string name="title">"wxBoxSizer H"</string>
@@ -264,9 +322,16 @@ 
                <string name="proxy-Id name">"ID_RADIOBOX"</string>

                <long name="proxy-Id value">10001</long>

                <string name="proxy-Class">"wxRadioBox"</string>

                <string name="proxy-Base class">"wxRadioBox"</string>

                <bool name="proxy-External implementation">1</bool>

                <bool name="proxy-Separate files">0</bool>

                <string name="proxy-Implementation filename">""</string>

                <string name="proxy-Header filename">""</string>

                <string name="proxy-Member variable name">"m_AnnotProjetCtrl"</string>

                <string name="proxy-Label">"annotate:"</string>

                <long name="proxy-Major dimension count">1</long>

                <string name="proxy-Items">"Hierarchy|Current sheet"</string>

                <long name="proxy-Initial value">0</long>

                <string name="proxy-Help text">""</string>

                <string name="proxy-Tooltip text">""</string>

                <string name="proxy-Background colour">""</string>
@@ -279,14 +344,15 @@ 
                <string name="proxy-Data validator">""</string>

                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>

                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>

                <string name="proxy-Items">"Hierarchy|Current sheet"</string>

                <bool name="proxy-wxWANTS_CHARS">0</bool>

                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>

                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>

                <string name="proxy-Custom styles">""</string>

                <long name="proxy-X">-1</long>

                <long name="proxy-Y">-1</long>

                <long name="proxy-Width">-1</long>

                <long name="proxy-Height">-1</long>

                <string name="proxy-AlignH">"Left"</string>

                <string name="proxy-AlignH">"Expand"</string>

                <string name="proxy-AlignV">"Centre"</string>

                <long name="proxy-Stretch factor">0</long>

                <long name="proxy-Border">5</long>
@@ -314,9 +380,74 @@ 
                <string name="proxy-Id name">"ID_RADIOBOX1"</string>

                <long name="proxy-Id value">10002</long>

                <string name="proxy-Class">"wxRadioBox"</string>

                <string name="proxy-Base class">"wxRadioBox"</string>

                <bool name="proxy-External implementation">1</bool>

                <bool name="proxy-Separate files">0</bool>

                <string name="proxy-Implementation filename">""</string>

                <string name="proxy-Header filename">""</string>

                <string name="proxy-Member variable name">"m_AnnotNewCmpCtrl"</string>

                <string name="proxy-Label">"select items:"</string>

                <long name="proxy-Major dimension count">1</long>

                <string name="proxy-Items">"all components|new components only"</string>

                <long name="proxy-Initial value">0</long>

                <string name="proxy-Help text">""</string>

                <string name="proxy-Tooltip text">""</string>

                <string name="proxy-Background colour">""</string>

                <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>

                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>

                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>

                <bool name="proxy-wxWANTS_CHARS">0</bool>

                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>

                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>

                <string name="proxy-Custom styles">""</string>

                <long name="proxy-X">-1</long>

                <long name="proxy-Y">-1</long>

                <long name="proxy-Width">-1</long>

                <long name="proxy-Height">-1</long>

                <string name="proxy-AlignH">"Expand"</string>

                <string name="proxy-AlignV">"Centre"</string>

                <long name="proxy-Stretch factor">0</long>

                <long name="proxy-Border">5</long>

                <bool name="proxy-wxLEFT">1</bool>

                <bool name="proxy-wxRIGHT">1</bool>

                <bool name="proxy-wxTOP">1</bool>

                <bool name="proxy-wxBOTTOM">1</bool>

                <bool name="proxy-wxSHAPED">0</bool>

                <bool name="proxy-wxADJUST_MINSIZE">0</bool>

                <bool name="proxy-wxFIXED_MINSIZE">0</bool>

                <string name="proxy-Custom arguments">""</string>

                <string name="proxy-Custom ctor arguments">""</string>

              </document>

              <document>

                <string name="title">"wxRadioBox: ID_RADIOBOX2"</string>

                <string name="type">"dialog-control-document"</string>

                <string name="filename">""</string>

                <string name="icon-name">"radiobox"</string>

                <long name="is-transient">0</long>

                <long name="owns-file">1</long>

                <long name="title-mode">0</long>

                <long name="locked">0</long>

                <string name="created">"5/7/2007"</string>

                <string name="proxy-type">"wbRadioBoxProxy"</string>

                <string name="proxy-Id name">"ID_RADIOBOX2"</string>

                <long name="proxy-Id value">10005</long>

                <string name="proxy-Class">"wxRadioBox"</string>

                <string name="proxy-Base class">"wxRadioBox"</string>

                <bool name="proxy-External implementation">1</bool>

                <bool name="proxy-Separate files">0</bool>

                <string name="proxy-Implementation filename">""</string>

                <string name="proxy-Header filename">""</string>

                <string name="proxy-Member variable name">"m_AnnotSortCmpCtrl"</string>

                <string name="proxy-Label">"sorting:"</string>

                <long name="proxy-Major dimension count">1</long>

                <string name="proxy-Items">"by position|by value"</string>

                <long name="proxy-Initial value">0</long>

                <string name="proxy-Help text">""</string>

                <string name="proxy-Tooltip text">""</string>

                <string name="proxy-Background colour">""</string>
@@ -329,14 +460,15 @@ 
                <string name="proxy-Data validator">""</string>

                <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>

                <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>

                <string name="proxy-Items">"all components|new components only"</string>

                <bool name="proxy-wxWANTS_CHARS">0</bool>

                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>

                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>

                <string name="proxy-Custom styles">""</string>

                <long name="proxy-X">-1</long>

                <long name="proxy-Y">-1</long>

                <long name="proxy-Width">-1</long>

                <long name="proxy-Height">-1</long>

                <string name="proxy-AlignH">"Left"</string>

                <string name="proxy-AlignH">"Expand"</string>

                <string name="proxy-AlignV">"Centre"</string>

                <long name="proxy-Stretch factor">0</long>

                <long name="proxy-Border">5</long>
@@ -391,6 +523,11 @@ 
                <string name="proxy-Id name">"ID_ANNOTATE_CMP"</string>

                <long name="proxy-Id value">10003</long>

                <string name="proxy-Class">"wxButton"</string>

                <string name="proxy-Base class">"wxButton"</string>

                <bool name="proxy-External implementation">1</bool>

                <bool name="proxy-Separate files">0</bool>

                <string name="proxy-Implementation filename">""</string>

                <string name="proxy-Header filename">""</string>

                <string name="proxy-Member variable name">""</string>

                <string name="proxy-Label">"&amp;Annotate"</string>

                <bool name="proxy-Default">1</bool>
@@ -409,6 +546,8 @@ 
                <bool name="proxy-wxBU_EXACTFIT">0</bool>

                <bool name="proxy-wxNO_BORDER">0</bool>

                <bool name="proxy-wxWANTS_CHARS">0</bool>

                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>

                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>

                <string name="proxy-Custom styles">""</string>

                <long name="proxy-X">-1</long>

                <long name="proxy-Y">-1</long>
@@ -443,6 +582,11 @@ 
                <string name="proxy-Id name">"ID_DEANNOTATE_CMP"</string>

                <long name="proxy-Id value">10004</long>

                <string name="proxy-Class">"wxButton"</string>

                <string name="proxy-Base class">"wxButton"</string>

                <bool name="proxy-External implementation">1</bool>

                <bool name="proxy-Separate files">0</bool>

                <string name="proxy-Implementation filename">""</string>

                <string name="proxy-Header filename">""</string>

                <string name="proxy-Member variable name">""</string>

                <string name="proxy-Label">"&amp;Del Annotate"</string>

                <bool name="proxy-Default">0</bool>
@@ -461,6 +605,8 @@ 
                <bool name="proxy-wxBU_EXACTFIT">0</bool>

                <bool name="proxy-wxNO_BORDER">0</bool>

                <bool name="proxy-wxWANTS_CHARS">0</bool>

                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>

                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>

                <string name="proxy-Custom styles">""</string>

                <long name="proxy-X">-1</long>

                <long name="proxy-Y">-1</long>
@@ -495,6 +641,11 @@ 
                <string name="proxy-Id name">"wxID_CLOSE"</string>

                <long name="proxy-Id value">5001</long>

                <string name="proxy-Class">"wxButton"</string>

                <string name="proxy-Base class">"wxButton"</string>

                <bool name="proxy-External implementation">1</bool>

                <bool name="proxy-Separate files">0</bool>

                <string name="proxy-Implementation filename">""</string>

                <string name="proxy-Header filename">""</string>

                <string name="proxy-Member variable name">""</string>

                <string name="proxy-Label">"&amp;Close"</string>

                <bool name="proxy-Default">0</bool>
@@ -513,6 +664,8 @@ 
                <bool name="proxy-wxBU_EXACTFIT">0</bool>

                <bool name="proxy-wxNO_BORDER">0</bool>

                <bool name="proxy-wxWANTS_CHARS">0</bool>

                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>

                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>

                <string name="proxy-Custom styles">""</string>

                <long name="proxy-X">-1</long>

                <long name="proxy-Y">-1</long>