diff --git a/cvpcb/readschematicnetlist.cpp b/cvpcb/readschematicnetlist.cpp index 9e5d227d01..23a0dd2caf 100644 --- a/cvpcb/readschematicnetlist.cpp +++ b/cvpcb/readschematicnetlist.cpp @@ -200,8 +200,8 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist() ptchar = strstr( (char*) &Line[idx], " " ); // Search end of value field (space) if( ptchar == 0 ) { - wxString msg; - msg.Printf( _( "Netlist error: %s" ), (const wxChar*) CONV_FROM_UTF8( Line ) ); + wxString msg = _( "Netlist error: " ); + msg << CONV_FROM_UTF8( Line ); DisplayError( this, msg ); k = 0; } diff --git a/eeschema/dialogs/dialog_eeschema_config_fbp.fbp b/eeschema/dialogs/dialog_eeschema_config_fbp.fbp index 6e0a371396..34aa6477cc 100644 --- a/eeschema/dialogs/dialog_eeschema_config_fbp.fbp +++ b/eeschema/dialogs/dialog_eeschema_config_fbp.fbp @@ -1,792 +1,792 @@ - - - - - - C++ - 1 - UTF-8 - connect - dialog_eeschema_config_fbp - 1000 - none - 1 - dialog_eeschema_config - - . - - 1 - 1 - 0 - - - wxBOTH - - 1 - - - - 0 - wxID_ANY - - - DIALOG_EESCHEMA_CONFIG_FBP - - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - - - - - - - - - OnCloseWindow - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - wxID_ANY - Component library files - - sbLibsChoiceSizer - wxHORIZONTAL - none - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - - - - 1 - - - 0 - wxID_ANY - - 400,250 - m_ListLibr - protected - - - wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE - - List of active library files. Only library files in this list are loaded by Eeschema. The order of this list is important: Eeschema searchs for a given component using this list order priority. - - - - - - - - - - - - - - OnFilesListClick - OnFilesListClick - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - - bRightSizer - wxVERTICAL - none - - 5 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - ID_ADD_LIB - Add - - - m_buttonAddLib - protected - - - - - Add a new library after the selected library, and load it - - - - OnAddOrInsertLibClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - wxID_ANY - Insert - - - m_buttonIns - protected - - - - - Add a new library before the selected library, and load it - - - - OnAddOrInsertLibClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - ID_REMOVE_LIB - Remove - - - m_buttonRemoveLib - protected - - - - - Unload the selected library - - - - OnRemoveLibClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - - - 0 - 1 - - - 0 - wxID_ANY - Up - - - m_buttonUp - protected - - - - - - - - - OnButtonUpClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - wxID_ANY - Down - - - m_buttonDown - protected - - - - - - - - - OnButtonDownClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - wxID_ANY - User defined search path - - sbSizer4 - wxHORIZONTAL - none - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - - - - 1 - - - 0 - wxID_ANY - - 400,90 - m_listUserPaths - protected - - - wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE - - Additional paths used in this project. The priority is highter than default Kicad paths. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - - bUserPathsButtonsSizer - wxVERTICAL - none - - 5 - wxLEFT|wxRIGHT|wxTOP|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - ID_LIB_PATH_SEL - Add - - - m_buttonAddPath - protected - - - - - - - - - OnAddOrInsertPath - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxLEFT|wxRIGHT|wxTOP|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - wxID_INSERT_PATH - Insert - - - m_buttonInsPath - protected - - - - - - - - - OnAddOrInsertPath - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - wxID_REMOVE_PATH - Remove - - - m_buttonRemovePath - protected - - - - - - - - - OnRemoveUserPath - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - wxID_ANY - Current search path list - - sbLibPathSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - - - 1 - - - 0 - wxID_ANY - - -1,70 - m_DefaultLibraryPathslistBox - protected - - - wxLB_NEEDED_SB - - Paths (system paths and user paths) used to search and load libraries files and component doc files. Sorted by decreasing priority order. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline3 - protected - - - wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - public - - OnCancelClick - - - - OnOkClick - - - - - - - - + + + + + + C++ + 1 + UTF-8 + connect + dialog_eeschema_config_fbp + 1000 + none + 1 + dialog_eeschema_config + + . + + 1 + 1 + 0 + + + wxBOTH + + 1 + + + + 0 + wxID_ANY + + + DIALOG_EESCHEMA_CONFIG_FBP + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + + + + + + + + + OnCloseWindow + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + wxID_ANY + Component library files + + sbLibsChoiceSizer + wxHORIZONTAL + none + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + + + 1 + + + 0 + wxID_ANY + + 400,250 + m_ListLibr + protected + + + wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE + + List of active library files. Only library files in this list are loaded by Eeschema. The order of this list is important: Eeschema searchs for a given component using this list order priority. + + + + + + + + + + + + + + OnFilesListClick + OnFilesListClick + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + + bRightSizer + wxVERTICAL + none + + 5 + wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + ID_ADD_LIB + Add + + + m_buttonAddLib + protected + + + + + Add a new library after the selected library, and load it + + + + OnAddOrInsertLibClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxTOP|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + wxID_ANY + Insert + + + m_buttonIns + protected + + + + + Add a new library before the selected library, and load it + + + + OnAddOrInsertLibClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + ID_REMOVE_LIB + Remove + + + m_buttonRemoveLib + protected + + + + + Unload the selected library + + + + OnRemoveLibClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + + + 0 + 1 + + + 0 + wxID_ANY + Up + + + m_buttonUp + protected + + + + + + + + + OnButtonUpClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + wxID_ANY + Down + + + m_buttonDown + protected + + + + + + + + + OnButtonDownClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + wxID_ANY + User defined search path + + sbSizer4 + wxHORIZONTAL + none + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + + + 1 + + + 0 + wxID_ANY + + 400,90 + m_listUserPaths + protected + + + wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE + + Additional paths used in this project. The priority is highter than default Kicad paths. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + + bUserPathsButtonsSizer + wxVERTICAL + none + + 5 + wxLEFT|wxRIGHT|wxTOP|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + ID_LIB_PATH_SEL + Add + + + m_buttonAddPath + protected + + + + + + + + + OnAddOrInsertPath + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxLEFT|wxRIGHT|wxTOP|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + wxID_INSERT_PATH + Insert + + + m_buttonInsPath + protected + + + + + + + + + OnAddOrInsertPath + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + wxID_REMOVE_PATH + Remove + + + m_buttonRemovePath + protected + + + + + + + + + OnRemoveUserPath + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + wxID_ANY + Current search path list + + sbLibPathSizer + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + + + 1 + + + 0 + wxID_ANY + + -1,70 + m_DefaultLibraryPathslistBox + protected + + + wxLB_NEEDED_SB + + Paths (system paths and user paths) used to search and load libraries files and component doc files. Sorted by decreasing priority order. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_staticline3 + protected + + + wxLI_HORIZONTAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + public + + OnCancelClick + + + + OnOkClick + + + + + + + + diff --git a/eeschema/dialogs/dialog_eeschema_options_base.cpp b/eeschema/dialogs/dialog_eeschema_options_base.cpp index ef8ff650b9..a4ee70b4ad 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.cpp +++ b/eeschema/dialogs/dialog_eeschema_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Sep 8 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -124,23 +124,18 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx bSizer2 = new wxBoxSizer( wxVERTICAL ); m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show g&rid"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkShowGrid, 0, wxALL|wxEXPAND, 3 ); m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 ); m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Enable automatic &panning"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkAutoPan, 0, wxALL|wxEXPAND, 3 ); m_checkHVOrientation = new wxCheckBox( m_panel1, wxID_ANY, _("Allow buses and wires to be placed in H or V &orientation only"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkHVOrientation, 0, wxALL|wxEXPAND, 3 ); m_checkPageLimits = new wxCheckBox( m_panel1, wxID_ANY, _("Show p&age limits"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2->Add( m_checkPageLimits, 0, wxALL|wxEXPAND, 3 ); bSizer3->Add( bSizer2, 0, wxEXPAND, 0 ); @@ -173,7 +168,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx bSizer7 = new wxBoxSizer( wxVERTICAL ); wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 2, 2, 0, 0 ); + fgSizer2 = new wxFlexGridSizer( 8, 2, 0, 0 ); fgSizer2->AddGrowableCol( 1 ); fgSizer2->SetFlexibleDirection( wxHORIZONTAL ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); diff --git a/eeschema/dialogs/dialog_eeschema_options_base.fbp b/eeschema/dialogs/dialog_eeschema_options_base.fbp index fd4c330b1a..b241b1f699 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.fbp +++ b/eeschema/dialogs/dialog_eeschema_options_base.fbp @@ -1,10 +1,12 @@ - + C++ 1 + source_name + 0 UTF-8 table dialog_eeschema_options_base @@ -16,13 +18,16 @@ . 1 + 1 1 0 wxBOTH + 1 1 + impl_virtual @@ -37,6 +42,10 @@ Schematic Editor Options + + wxFILTER_NONE + wxDefaultValidator + @@ -92,6 +101,7 @@ + 1 1 @@ -106,6 +116,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -141,6 +155,7 @@ + 1 1 @@ -154,6 +169,10 @@ + + wxFILTER_NONE + wxDefaultValidator + wxTAB_TRAVERSAL @@ -217,6 +236,7 @@ + 1 1 @@ -232,6 +252,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -269,6 +293,7 @@ + 1 1 @@ -283,6 +308,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -329,6 +358,7 @@ + 1 1 @@ -344,6 +374,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -381,6 +415,7 @@ + 1 1 @@ -395,6 +430,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -431,6 +470,7 @@ + 1 1 @@ -446,6 +486,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -482,6 +526,7 @@ + 1 1 @@ -497,6 +542,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -533,6 +582,7 @@ + 1 1 @@ -550,6 +600,10 @@ wxSP_ARROW_KEYS|wxSP_WRAP + + wxFILTER_NONE + wxDefaultValidator + @@ -588,6 +642,7 @@ + 1 1 @@ -603,6 +658,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -639,6 +698,7 @@ + 1 1 @@ -654,6 +714,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -690,6 +754,7 @@ + 1 1 @@ -707,6 +772,10 @@ wxSP_ARROW_KEYS|wxSP_WRAP + + wxFILTER_NONE + wxDefaultValidator + @@ -745,6 +814,7 @@ + 1 1 @@ -760,6 +830,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -796,6 +870,7 @@ + 1 1 @@ -811,6 +886,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -847,6 +926,7 @@ + 1 1 @@ -864,6 +944,10 @@ wxSP_ARROW_KEYS|wxSP_WRAP + + wxFILTER_NONE + wxDefaultValidator + @@ -902,6 +986,7 @@ + 1 1 @@ -917,6 +1002,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -953,6 +1042,7 @@ + 1 1 @@ -968,6 +1058,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1004,6 +1098,7 @@ + 1 1 @@ -1021,6 +1116,10 @@ wxSP_ARROW_KEYS|wxSP_WRAP + + wxFILTER_NONE + wxDefaultValidator + @@ -1059,6 +1158,7 @@ + 1 1 @@ -1074,6 +1174,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1110,6 +1214,7 @@ + 1 1 @@ -1125,6 +1230,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1161,6 +1270,7 @@ + 1 1 @@ -1178,6 +1288,10 @@ wxSP_ARROW_KEYS|wxSP_WRAP + + wxFILTER_NONE + wxDefaultValidator + 1 @@ -1238,6 +1352,7 @@ 0 + 1 1 @@ -1253,6 +1368,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1290,6 +1409,7 @@ 0 + 1 1 @@ -1305,6 +1425,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1342,6 +1466,7 @@ 0 + 1 1 @@ -1357,6 +1482,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1394,6 +1523,7 @@ 0 + 1 1 @@ -1409,6 +1539,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1446,6 +1580,7 @@ 0 + 1 1 @@ -1461,6 +1596,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1514,6 +1653,7 @@ + 1 1 @@ -1527,6 +1667,10 @@ User defined field names for schematic components. + + wxFILTER_NONE + wxDefaultValidator + wxTAB_TRAVERSAL @@ -1574,6 +1718,7 @@ + 1 1 @@ -1589,6 +1734,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1643,7 +1792,7 @@ fgSizer2 wxFLEX_GROWMODE_SPECIFIED none - 2 + 8 0 3 @@ -1652,6 +1801,7 @@ + 1 1 @@ -1667,6 +1817,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1703,6 +1857,7 @@ + 1 1 @@ -1718,6 +1873,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1758,6 +1917,7 @@ + 1 1 @@ -1773,6 +1933,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1809,6 +1973,7 @@ + 1 1 @@ -1824,6 +1989,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1864,6 +2033,7 @@ + 1 1 @@ -1879,6 +2049,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1915,6 +2089,7 @@ + 1 1 @@ -1930,6 +2105,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1970,6 +2149,7 @@ + 1 1 @@ -1985,6 +2165,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2021,6 +2205,7 @@ + 1 1 @@ -2036,6 +2221,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2076,6 +2265,7 @@ + 1 1 @@ -2091,6 +2281,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2127,6 +2321,7 @@ + 1 1 @@ -2142,6 +2337,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2182,6 +2381,7 @@ + 1 1 @@ -2197,6 +2397,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2233,6 +2437,7 @@ + 1 1 @@ -2248,6 +2453,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2288,6 +2497,7 @@ + 1 1 @@ -2303,6 +2513,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2339,6 +2553,7 @@ + 1 1 @@ -2354,6 +2569,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2394,6 +2613,7 @@ + 1 1 @@ -2409,6 +2629,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2445,6 +2669,7 @@ + 1 1 @@ -2460,6 +2685,10 @@ + + wxFILTER_NONE + wxDefaultValidator + diff --git a/eeschema/dialogs/dialog_eeschema_options_base.h b/eeschema/dialogs/dialog_eeschema_options_base.h index d34589cb62..a1cbb23f0d 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.h +++ b/eeschema/dialogs/dialog_eeschema_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Sep 8 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -96,10 +96,11 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public wxDialog wxButton* m_sdbSizer1Cancel; // Virtual event handlers, overide them in your derived class - virtual void OnChooseUnits( wxCommandEvent& event ){ event.Skip(); } + virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); } public: + DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EESCHEMA_OPTIONS_BASE(); diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index 778ca48493..875f65a33f 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -478,7 +478,6 @@ bool SCH_TEXT::Load( LINE_READER& aLine, wxString& aErrorMsg ) } wxString val = CONV_FROM_UTF8( text ); - for( ;; ) { int i = val.find( wxT( "\\n" ) ); diff --git a/gerbview/edit.cpp b/gerbview/edit.cpp index f3ccbf4c7b..bc1773a3cd 100644 --- a/gerbview/edit.cpp +++ b/gerbview/edit.cpp @@ -112,7 +112,7 @@ void WinEDA_GerberFrame::Process_Special_Functions( wxCommandEvent& event ) break; default: - DrawPanel->UnManageCursor( 0, 0, wxEmptyString ); + DrawPanel->UnManageCursor( ); break; } diff --git a/include/macros.h b/include/macros.h index 97dc86f984..157597d80f 100644 --- a/include/macros.h +++ b/include/macros.h @@ -7,11 +7,16 @@ #include - +// Note: we should use wxConvUTF8 insdeat of wxConvCurrent here, +// in order to use UTF8 in Kicad files. +// But this change break compatibility with older files under Windows, +// if some non ASCII characters are found in strings. +// So this is a TODO change. #if wxUSE_UNICODE #define CONV_TO_UTF8( wxstring ) ( (const char*) wxConvCurrent->cWX2MB( wxstring ) ) #define CONV_FROM_UTF8( utf8string ) ( wxConvCurrent->cMB2WC( utf8string ) ) #else +// Should not used: Kicad uses Unicode verion on wxWidgets #define CONV_TO_UTF8( wxstring ) ( (const char*) ( (wxstring).c_str() ) ) #define CONV_FROM_UTF8( utf8string ) (utf8string) #endif diff --git a/pcbnew/dialogs/dialog_design_rules_base.cpp b/pcbnew/dialogs/dialog_design_rules_base.cpp index 02be2970b6..2ccf2c0751 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.cpp +++ b/pcbnew/dialogs/dialog_design_rules_base.cpp @@ -153,7 +153,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_panelNetClassesEditor->SetSizer( bpanelNetClassesSizer ); m_panelNetClassesEditor->Layout(); bpanelNetClassesSizer->Fit( m_panelNetClassesEditor ); - m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), false ); + m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), true ); m_panelGolbalDesignRules = new wxPanel( m_DRnotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); wxBoxSizer* bpanelGlobRulesSizer; bpanelGlobRulesSizer = new wxBoxSizer( wxVERTICAL ); @@ -173,7 +173,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID sbViasOptionSizer->Add( m_OptViaType, 0, wxALL|wxEXPAND, 5 ); wxFlexGridSizer* fgViasMinValuesSizer; - fgViasMinValuesSizer = new wxFlexGridSizer( 1, 2, 0, 0 ); + fgViasMinValuesSizer = new wxFlexGridSizer( 2, 2, 0, 0 ); fgViasMinValuesSizer->AddGrowableCol( 1 ); fgViasMinValuesSizer->SetFlexibleDirection( wxBOTH ); fgViasMinValuesSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -208,7 +208,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID sbuViasSizer->Add( m_AllowMicroViaCtrl, 0, wxALL|wxEXPAND, 5 ); wxFlexGridSizer* fgMinMicroviasValuesSizer; - fgMinMicroviasValuesSizer = new wxFlexGridSizer( 1, 2, 0, 0 ); + fgMinMicroviasValuesSizer = new wxFlexGridSizer( 2, 2, 0, 0 ); fgMinMicroviasValuesSizer->AddGrowableCol( 1 ); fgMinMicroviasValuesSizer->SetFlexibleDirection( wxBOTH ); fgMinMicroviasValuesSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -357,7 +357,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_panelGolbalDesignRules->SetSizer( bpanelGlobRulesSizer ); m_panelGolbalDesignRules->Layout(); bpanelGlobRulesSizer->Fit( m_panelGolbalDesignRules ); - m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), true ); + m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), false ); bMainSizer->Add( m_DRnotebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/dialog_design_rules_base.fbp b/pcbnew/dialogs/dialog_design_rules_base.fbp index 411a15d1e1..d611b5bd43 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.fbp +++ b/pcbnew/dialogs/dialog_design_rules_base.fbp @@ -142,7 +142,7 @@ Net Classes Editor - 0 + 1 @@ -1048,7 +1048,7 @@ Global Design Rules - 1 + 0 @@ -1195,7 +1195,7 @@ fgViasMinValuesSizer wxFLEX_GROWMODE_SPECIFIED none - 1 + 2 0 5 @@ -1518,7 +1518,7 @@ fgMinMicroviasValuesSizer wxFLEX_GROWMODE_SPECIFIED none - 1 + 2 0 5 diff --git a/pcbnew/pcbnew.h b/pcbnew/pcbnew.h index 9c09ef4a3a..fdb84a56b0 100644 --- a/pcbnew/pcbnew.h +++ b/pcbnew/pcbnew.h @@ -5,7 +5,6 @@ #define PCBNEW_H #include "pcbstruct.h" -#include "macros.h" #include "pcbcommon.h" #include "class_board_design_settings.h"