diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp index 3b7f7e5d7d..f0a89636ee 100644 --- a/common/fp_lib_table.cpp +++ b/common/fp_lib_table.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2010-2012 SoftPLC Corporation, Dick Hollenbeck * Copyright (C) 2012 Wayne Stambaugh - * Copyright (C) 2012-2015 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2012-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -31,7 +31,6 @@ #include -//#include #include #include #include @@ -181,7 +180,8 @@ MODULE* FP_LIB_TABLE::FootprintLoad( const wxString& aNickname, const wxString& } -FP_LIB_TABLE::SAVE_T FP_LIB_TABLE::FootprintSave( const wxString& aNickname, const MODULE* aFootprint, bool aOverwrite ) +FP_LIB_TABLE::SAVE_T FP_LIB_TABLE::FootprintSave( const wxString& aNickname, + const MODULE* aFootprint, bool aOverwrite ) { const ROW* row = FindRow( aNickname ); wxASSERT( (PLUGIN*) row->plugin ); @@ -193,9 +193,10 @@ FP_LIB_TABLE::SAVE_T FP_LIB_TABLE::FootprintSave( const wxString& aNickname, con wxString fpname = aFootprint->GetFPID().GetFootprintName(); - std::auto_ptr m( row->plugin->FootprintLoad( row->GetFullURI( true ), fpname, row->GetProperties() ) ); + std::unique_ptr footprint( row->plugin->FootprintLoad( row->GetFullURI( true ), + fpname, row->GetProperties() ) ); - if( m.get() ) + if( footprint.get() ) return SAVE_SKIPPED; } diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp index f051319c8c..31372db48f 100644 --- a/eeschema/class_library.cpp +++ b/eeschema/class_library.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2004-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2008-2015 Wayne Stambaugh - * Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -794,7 +794,7 @@ bool PART_LIB::SaveHeader( OUTPUTFORMATTER& aFormatter ) PART_LIB* PART_LIB::LoadLibrary( const wxString& aFileName ) throw( IO_ERROR, boost::bad_pointer ) { - std::auto_ptr lib( new PART_LIB( LIBRARY_TYPE_EESCHEMA, aFileName ) ); + std::unique_ptr lib( new PART_LIB( LIBRARY_TYPE_EESCHEMA, aFileName ) ); wxBusyCursor ShowWait; diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp index f9d2ca6dfe..c709c15e14 100644 --- a/eeschema/dialogs/dialog_erc.cpp +++ b/eeschema/dialogs/dialog_erc.cpp @@ -487,7 +487,7 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList ) */ TestDuplicateSheetNames( true ); - std::auto_ptr objectsConnectedList( m_parent->BuildNetListBase() ); + std::unique_ptr objectsConnectedList( m_parent->BuildNetListBase() ); // Reset the connection type indicator objectsConnectedList->ResetConnectionsType(); diff --git a/eeschema/lib_export.cpp b/eeschema/lib_export.cpp index ab74805d56..d4d5c1d4c1 100644 --- a/eeschema/lib_export.cpp +++ b/eeschema/lib_export.cpp @@ -1,9 +1,9 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com + * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2008-2016 Wayne Stambaugh - * Copyright (C) 2004-2016 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -126,7 +126,7 @@ void LIB_EDIT_FRAME::OnExportPart( wxCommandEvent& event ) fn = dlg.GetPath(); - std::auto_ptr temp_lib( new PART_LIB( LIBRARY_TYPE_EESCHEMA, fn.GetFullPath() ) ); + std::unique_ptr temp_lib( new PART_LIB( LIBRARY_TYPE_EESCHEMA, fn.GetFullPath() ) ); SaveOnePart( temp_lib.get() ); diff --git a/eeschema/netlist.cpp b/eeschema/netlist.cpp index 8a490e89f5..b00d49bbb9 100644 --- a/eeschema/netlist.cpp +++ b/eeschema/netlist.cpp @@ -124,7 +124,7 @@ bool SCH_EDIT_FRAME::CreateNetlist( int aFormat, const wxString& aFullFileName, if( !prepareForNetlist() ) return false; - std::auto_ptr connectedItemsList( BuildNetListBase() ); + std::unique_ptr connectedItemsList( BuildNetListBase() ); bool success = WriteNetListFile( connectedItemsList.release(), aFormat, aFullFileName, aNetlistOptions, aReporter ); @@ -170,7 +170,7 @@ void NETLIST_OBJECT_LIST::SortListbySheet() NETLIST_OBJECT_LIST* SCH_EDIT_FRAME::BuildNetListBase() { // I own this list until I return it to the new owner. - std::auto_ptr ret( new NETLIST_OBJECT_LIST() ); + std::unique_ptr ret( new NETLIST_OBJECT_LIST() ); // Creates the flattened sheet list: SCH_SHEET_LIST aSheets( g_RootSheet ); diff --git a/eeschema/netlist_exporters/netlist_exporter_kicad.cpp b/eeschema/netlist_exporters/netlist_exporter_kicad.cpp index e4b624cd0e..75561819e3 100644 --- a/eeschema/netlist_exporters/netlist_exporter_kicad.cpp +++ b/eeschema/netlist_exporters/netlist_exporter_kicad.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 1992-2013 jp.charras at wanadoo.fr * Copyright (C) 2013 SoftPLC Corporation, Dick Hollenbeck - * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.TXT for contributors. + * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.TXT for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -33,27 +33,11 @@ bool NETLIST_EXPORTER_KICAD::WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions ) { -#if 0 - // Prepare list of nets generation - for( unsigned ii = 0; ii < m_masterList->size(); ii++ ) - m_masterList->GetItem( ii )->m_Flag = 0; - - std::auto_ptr xroot( makeRoot() ); - try { FILE_OUTPUTFORMATTER formatter( aOutFileName ); - - xroot->Format( &formatter, 0 ); - } -#else - try - { - FILE_OUTPUTFORMATTER formatter( aOutFileName ); - Format( &formatter, GNL_ALL ); } -#endif catch( const IO_ERROR& ioe ) { @@ -71,7 +55,7 @@ void NETLIST_EXPORTER_KICAD::Format( OUTPUTFORMATTER* aOut, int aCtl ) for( unsigned ii = 0; ii < m_masterList->size(); ii++ ) m_masterList->GetItem( ii )->m_Flag = 0; - std::auto_ptr xroot( makeRoot( aCtl ) ); + std::unique_ptr xroot( makeRoot( aCtl ) ); xroot->Format( aOut, 0 ); } diff --git a/eeschema/symbedit.cpp b/eeschema/symbedit.cpp index 10536b33e0..fd5b4eb80c 100644 --- a/eeschema/symbedit.cpp +++ b/eeschema/symbedit.cpp @@ -1,9 +1,9 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com + * Copyright (C) 2004 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2008-2011 Wayne Stambaugh - * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -77,7 +77,7 @@ void LIB_EDIT_FRAME::LoadOneSymbol() prj.SetRString( PROJECT::SCH_LIB_PATH, filename ); - std::auto_ptr lib( new PART_LIB( LIBRARY_TYPE_SYMBOL, filename ) ); + std::unique_ptr lib( new PART_LIB( LIBRARY_TYPE_SYMBOL, filename ) ); wxString err; diff --git a/pagelayout_editor/dialogs/properties_frame_base.cpp b/pagelayout_editor/dialogs/properties_frame_base.cpp index f4075f936c..81777a103a 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.cpp +++ b/pagelayout_editor/dialogs/properties_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 9 2015) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -13,241 +13,241 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c { wxBoxSizer* bSizerpanel; bSizerpanel = new wxBoxSizer( wxVERTICAL ); - + m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_swItemProperties = new wxScrolledWindow( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL ); m_swItemProperties->SetScrollRate( 5, 5 ); wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerButt; bSizerButt = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerType; bSizerType = new wxBoxSizer( wxVERTICAL ); - + m_staticTextType = new wxStaticText( m_swItemProperties, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextType->Wrap( -1 ); - m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - + m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + bSizerType->Add( m_staticTextType, 0, wxLEFT|wxRIGHT, 5 ); - + m_textCtrlType = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); bSizerType->Add( m_textCtrlType, 0, wxRIGHT|wxLEFT, 5 ); - - + + bSizerButt->Add( bSizerType, 0, 0, 5 ); - + wxBoxSizer* bSizerPageOpt; bSizerPageOpt = new wxBoxSizer( wxVERTICAL ); - + m_staticTextPageOpt = new wxStaticText( m_swItemProperties, wxID_ANY, _("Page 1 option"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPageOpt->Wrap( -1 ); - m_staticTextPageOpt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); - + m_staticTextPageOpt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + bSizerPageOpt->Add( m_staticTextPageOpt, 0, wxLEFT|wxRIGHT, 5 ); - + wxString m_choicePageOptChoices[] = { _("None"), _("Page 1 only"), _("Not on page 1") }; int m_choicePageOptNChoices = sizeof( m_choicePageOptChoices ) / sizeof( wxString ); m_choicePageOpt = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePageOptNChoices, m_choicePageOptChoices, 0 ); m_choicePageOpt->SetSelection( 0 ); bSizerPageOpt->Add( m_choicePageOpt, 0, wxRIGHT|wxLEFT, 5 ); - - + + bSizerButt->Add( bSizerPageOpt, 0, 0, 5 ); - - + + bSizerMain->Add( bSizerButt, 0, 0, 5 ); - + m_staticline5 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerMain->Add( m_staticline5, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_SizerTextOptions = new wxBoxSizer( wxVERTICAL ); - + m_staticTextText = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextText->Wrap( -1 ); m_SizerTextOptions->Add( m_staticTextText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlText = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); m_SizerTextOptions->Add( m_textCtrlText, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxBoxSizer* bSizerFontOpt; bSizerFontOpt = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerJustify; bSizerJustify = new wxBoxSizer( wxHORIZONTAL ); - + m_staticTextHjust = new wxStaticText( m_swItemProperties, wxID_ANY, _("H justification"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextHjust->Wrap( -1 ); bSizerJustify->Add( m_staticTextHjust, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - + wxString m_choiceHjustifyChoices[] = { _("Left"), _("Center"), _("Right") }; int m_choiceHjustifyNChoices = sizeof( m_choiceHjustifyChoices ) / sizeof( wxString ); m_choiceHjustify = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHjustifyNChoices, m_choiceHjustifyChoices, 0 ); m_choiceHjustify->SetSelection( 0 ); bSizerJustify->Add( m_choiceHjustify, 0, wxEXPAND|wxALL, 5 ); - + m_checkBoxBold = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Bold"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerJustify->Add( m_checkBoxBold, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - + + bSizerFontOpt->Add( bSizerJustify, 0, 0, 5 ); - + wxBoxSizer* bSizerBoldItalic; bSizerBoldItalic = new wxBoxSizer( wxHORIZONTAL ); - + m_staticTextVjust = new wxStaticText( m_swItemProperties, wxID_ANY, _("V justification"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextVjust->Wrap( -1 ); bSizerBoldItalic->Add( m_staticTextVjust, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - + wxString m_choiceVjustifyChoices[] = { _("Top"), _("Center"), _("Bottom") }; int m_choiceVjustifyNChoices = sizeof( m_choiceVjustifyChoices ) / sizeof( wxString ); m_choiceVjustify = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVjustifyNChoices, m_choiceVjustifyChoices, 0 ); m_choiceVjustify->SetSelection( 1 ); bSizerBoldItalic->Add( m_choiceVjustify, 0, wxEXPAND|wxALL, 5 ); - + m_checkBoxItalic = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Italic"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerBoldItalic->Add( m_checkBoxItalic, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - + + bSizerFontOpt->Add( bSizerBoldItalic, 1, 0, 5 ); - - + + m_SizerTextOptions->Add( bSizerFontOpt, 0, wxEXPAND, 5 ); - + wxBoxSizer* bSizerTextSize; bSizerTextSize = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerTsizeX; bSizerTsizeX = new wxBoxSizer( wxVERTICAL ); - + m_staticTexTsizeX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text Width (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTexTsizeX->Wrap( -1 ); bSizerTsizeX->Add( m_staticTexTsizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlTextSizeX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerTsizeX->Add( m_textCtrlTextSizeX, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerTextSize->Add( bSizerTsizeX, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerTsizeY; bSizerTsizeY = new wxBoxSizer( wxVERTICAL ); - + m_staticTextTsizeY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text Height (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTsizeY->Wrap( -1 ); bSizerTsizeY->Add( m_staticTextTsizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlTextSizeY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerTsizeY->Add( m_textCtrlTextSizeY, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerTextSize->Add( bSizerTsizeY, 1, wxEXPAND, 5 ); - - + + m_SizerTextOptions->Add( bSizerTextSize, 0, 0, 5 ); - + m_staticTextConstraints = new wxStaticText( m_swItemProperties, wxID_ANY, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextConstraints->Wrap( -1 ); m_SizerTextOptions->Add( m_staticTextConstraints, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizerConstraints; bSizerConstraints = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizer42; bSizer42 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextConstraintX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Max Size X (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextConstraintX->Wrap( -1 ); bSizer42->Add( m_staticTextConstraintX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlConstraintX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer42->Add( m_textCtrlConstraintX, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerConstraints->Add( bSizer42, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer52; bSizer52 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextConstraintY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Max Size Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextConstraintY->Wrap( -1 ); bSizer52->Add( m_staticTextConstraintY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlConstraintY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer52->Add( m_textCtrlConstraintY, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerConstraints->Add( bSizer52, 1, wxEXPAND, 5 ); - - + + m_SizerTextOptions->Add( bSizerConstraints, 0, 0, 5 ); - + m_staticline6 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_SizerTextOptions->Add( m_staticline6, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - + + bSizerMain->Add( m_SizerTextOptions, 0, wxEXPAND, 5 ); - + m_buttonOK = new wxButton( m_swItemProperties, wxID_ANY, _("Accept"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonOK->SetDefault(); + m_buttonOK->SetDefault(); bSizerMain->Add( m_buttonOK, 0, wxALL|wxEXPAND, 5 ); - + m_staticline8 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerMain->Add( m_staticline8, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_staticTextComment = new wxStaticText( m_swItemProperties, wxID_ANY, _("Comment"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextComment->Wrap( -1 ); bSizerMain->Add( m_staticTextComment, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlComment = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerMain->Add( m_textCtrlComment, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_staticline2 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerMain->Add( m_staticline2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizerPos; bSizerPos = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerPosXY; bSizerPosXY = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextPosX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Pos X (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosX->Wrap( -1 ); bSizer4->Add( m_staticTextPosX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlPosX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer4->Add( m_textCtrlPosX, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerPosXY->Add( bSizer4, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextPosY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Pos Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosY->Wrap( -1 ); bSizer5->Add( m_staticTextPosY, 0, wxRIGHT|wxLEFT, 5 ); - + m_textCtrlPosY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer5->Add( m_textCtrlPosY, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - + + bSizerPosXY->Add( bSizer5, 1, wxEXPAND, 5 ); - - + + bSizerPos->Add( bSizerPosXY, 1, 0, 5 ); - + wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextOrgPos = new wxStaticText( m_swItemProperties, wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgPos->Wrap( -1 ); bSizer6->Add( m_staticTextOrgPos, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_comboBoxCornerPos = new wxComboBox( m_swItemProperties, wxID_ANY, _("Lower Right"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_comboBoxCornerPos->Append( _("Upper Right") ); m_comboBoxCornerPos->Append( _("Upper Left") ); @@ -255,54 +255,54 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_comboBoxCornerPos->Append( _("Lower Left") ); m_comboBoxCornerPos->SetSelection( 2 ); bSizer6->Add( m_comboBoxCornerPos, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerPos->Add( bSizer6, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizerMain->Add( bSizerPos, 0, 0, 5 ); - + m_SizerEndPosition = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerEndXY; bSizerEndXY = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer41; bSizer41 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextEndX = new wxStaticText( m_swItemProperties, wxID_ANY, _("End X (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndX->Wrap( -1 ); bSizer41->Add( m_staticTextEndX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlEndX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer41->Add( m_textCtrlEndX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerEndXY->Add( bSizer41, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer51; bSizer51 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextEndY = new wxStaticText( m_swItemProperties, wxID_ANY, _("End Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndY->Wrap( -1 ); bSizer51->Add( m_staticTextEndY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlEndY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer51->Add( m_textCtrlEndY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerEndXY->Add( bSizer51, 1, wxEXPAND, 5 ); - - + + m_SizerEndPosition->Add( bSizerEndXY, 1, 0, 5 ); - + wxBoxSizer* bSizer61; bSizer61 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextOrgEnd = new wxStaticText( m_swItemProperties, wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgEnd->Wrap( -1 ); bSizer61->Add( m_staticTextOrgEnd, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_comboBoxCornerEnd = new wxComboBox( m_swItemProperties, wxID_ANY, _("Lower Right"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_comboBoxCornerEnd->Append( _("Upper Right") ); m_comboBoxCornerEnd->Append( _("Upper Left") ); @@ -310,139 +310,139 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_comboBoxCornerEnd->Append( _("Lower Left") ); m_comboBoxCornerEnd->SetSelection( 2 ); bSizer61->Add( m_comboBoxCornerEnd, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + m_SizerEndPosition->Add( bSizer61, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizerMain->Add( m_SizerEndPosition, 0, 0, 5 ); - + m_SizerLineThickness = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerThickness; bSizerThickness = new wxBoxSizer( wxVERTICAL ); - + m_staticTextThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextThickness->Wrap( -1 ); bSizerThickness->Add( m_staticTextThickness, 0, wxLEFT|wxRIGHT, 5 ); - + m_textCtrlThickness = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerThickness->Add( m_textCtrlThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + m_SizerLineThickness->Add( bSizerThickness, 0, wxEXPAND, 5 ); - + m_staticTextInfoThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Set to 0 to use default"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInfoThickness->Wrap( -1 ); m_SizerLineThickness->Add( m_staticTextInfoThickness, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizerMain->Add( m_SizerLineThickness, 0, 0, 5 ); - + m_SizerRotation = new wxBoxSizer( wxVERTICAL ); - + m_staticline1 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_SizerRotation->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizerRotation; bSizerRotation = new wxBoxSizer( wxHORIZONTAL ); - + m_staticTextRot = new wxStaticText( m_swItemProperties, wxID_ANY, _("Rotation"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRot->Wrap( -1 ); bSizerRotation->Add( m_staticTextRot, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_textCtrlRotation = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerRotation->Add( m_textCtrlRotation, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + m_SizerRotation->Add( bSizerRotation, 0, wxEXPAND, 5 ); - - + + bSizerMain->Add( m_SizerRotation, 0, wxEXPAND, 5 ); - + m_SizerBitmapPPI = new wxBoxSizer( wxHORIZONTAL ); - + m_staticTextBitmapPPI = new wxStaticText( m_swItemProperties, wxID_ANY, _("Bitmap PPI"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextBitmapPPI->Wrap( -1 ); m_SizerBitmapPPI->Add( m_staticTextBitmapPPI, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_textCtrlBitmapPPI = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizerBitmapPPI->Add( m_textCtrlBitmapPPI, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizerMain->Add( m_SizerBitmapPPI, 0, wxEXPAND, 5 ); - + m_staticline4 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerMain->Add( m_staticline4, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_staticTextRepeatPrms = new wxStaticText( m_swItemProperties, wxID_ANY, _("Repeat parameters:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRepeatPrms->Wrap( -1 ); bSizerMain->Add( m_staticTextRepeatPrms, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizer20; bSizer20 = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizer611; bSizer611 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextRepeatCnt = new wxStaticText( m_swItemProperties, wxID_ANY, _("Repeat count"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRepeatCnt->Wrap( -1 ); bSizer611->Add( m_staticTextRepeatCnt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlRepeatCount = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer611->Add( m_textCtrlRepeatCount, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizer20->Add( bSizer611, 1, 0, 5 ); - + m_SizerTextIncrementLabel = new wxBoxSizer( wxVERTICAL ); - + m_staticTextInclabel = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text Increment"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInclabel->Wrap( -1 ); m_SizerTextIncrementLabel->Add( m_staticTextInclabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlTextIncrement = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizerTextIncrementLabel->Add( m_textCtrlTextIncrement, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizer20->Add( m_SizerTextIncrementLabel, 1, wxEXPAND, 5 ); - - + + bSizerMain->Add( bSizer20, 0, 0, 5 ); - + wxBoxSizer* bSizerPosY1; bSizerPosY1 = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizer411; bSizer411 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextStepX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Step X (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStepX->Wrap( -1 ); bSizer411->Add( m_staticTextStepX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlStepX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer411->Add( m_textCtrlStepX, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerPosY1->Add( bSizer411, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer511; bSizer511 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextStepY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Step Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStepY->Wrap( -1 ); bSizer511->Add( m_staticTextStepY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlStepY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer511->Add( m_textCtrlStepY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerPosY1->Add( bSizer511, 1, wxEXPAND, 5 ); - - + + bSizerMain->Add( bSizerPosY1, 0, 0, 5 ); - - + + m_swItemProperties->SetSizer( bSizerMain ); m_swItemProperties->Layout(); bSizerMain->Fit( m_swItemProperties ); @@ -451,177 +451,177 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_swGeneralOpts->SetScrollRate( 5, 5 ); wxBoxSizer* bSizerGeneralOpts; bSizerGeneralOpts = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerGeneralOpts1; bSizerGeneralOpts1 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextDefVal = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Default Values:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefVal->Wrap( -1 ); bSizerGeneralOpts1->Add( m_staticTextDefVal, 0, wxALL, 5 ); - + wxBoxSizer* bSizerDefTextSize; bSizerDefTextSize = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerDefTsizeX; bSizerDefTsizeX = new wxBoxSizer( wxVERTICAL ); - + m_staticTextDefTsX = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text Size X (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefTsX->Wrap( -1 ); bSizerDefTsizeX->Add( m_staticTextDefTsX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlDefaultTextSizeX = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerDefTsizeX->Add( m_textCtrlDefaultTextSizeX, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerDefTextSize->Add( bSizerDefTsizeX, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerDefTsizeY; bSizerDefTsizeY = new wxBoxSizer( wxVERTICAL ); - + m_staticTextDefTsY = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text Size Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefTsY->Wrap( -1 ); bSizerDefTsizeY->Add( m_staticTextDefTsY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlDefaultTextSizeY = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerDefTsizeY->Add( m_textCtrlDefaultTextSizeY, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerDefTextSize->Add( bSizerDefTsizeY, 1, wxEXPAND, 5 ); - - + + bSizerGeneralOpts1->Add( bSizerDefTextSize, 0, wxEXPAND, 5 ); - + wxBoxSizer* bSizerDefLineWidth; bSizerDefLineWidth = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizer25; bSizer25 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextDefLineW = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Line Thickness (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefLineW->Wrap( -1 ); bSizer25->Add( m_staticTextDefLineW, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlDefaultLineWidth = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer25->Add( m_textCtrlDefaultLineWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerDefLineWidth->Add( bSizer25, 1, 0, 5 ); - + wxBoxSizer* bSizerDefTextThickness; bSizerDefTextThickness = new wxBoxSizer( wxVERTICAL ); - + m_staticText22 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText22->Wrap( -1 ); bSizerDefTextThickness->Add( m_staticText22, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlDefaultTextThickness = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerDefTextThickness->Add( m_textCtrlDefaultTextThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerDefLineWidth->Add( bSizerDefTextThickness, 1, 0, 5 ); - - + + bSizerGeneralOpts1->Add( bSizerDefLineWidth, 0, wxEXPAND, 5 ); - - + + bSizerGeneralOpts->Add( bSizerGeneralOpts1, 0, 0, 5 ); - + m_buttonDefault = new wxButton( m_swGeneralOpts, wxID_ANY, _("Set to Default"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerGeneralOpts->Add( m_buttonDefault, 0, wxALL|wxEXPAND, 5 ); - + m_staticline9 = new wxStaticLine( m_swGeneralOpts, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerGeneralOpts->Add( m_staticline9, 0, wxEXPAND | wxALL, 5 ); - + wxBoxSizer* bSizerGeneraMargins; bSizerGeneraMargins = new wxBoxSizer( wxVERTICAL ); - + m_staticTextMargins = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Page Margins"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextMargins->Wrap( -1 ); bSizerGeneraMargins->Add( m_staticTextMargins, 0, wxALL, 5 ); - + wxBoxSizer* bSizerDefLRMargins; bSizerDefLRMargins = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerDefLeftMargin; bSizerDefLeftMargin = new wxBoxSizer( wxVERTICAL ); - + m_staticTextLeftMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Left Margin (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextLeftMargin->Wrap( -1 ); bSizerDefLeftMargin->Add( m_staticTextLeftMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlLeftMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerDefLeftMargin->Add( m_textCtrlLeftMargin, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerDefLRMargins->Add( bSizerDefLeftMargin, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerDefTsizeY1; bSizerDefTsizeY1 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextDefRightMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Right Margin (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefRightMargin->Wrap( -1 ); bSizerDefTsizeY1->Add( m_staticTextDefRightMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlRightMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerDefTsizeY1->Add( m_textCtrlRightMargin, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerDefLRMargins->Add( bSizerDefTsizeY1, 1, wxEXPAND, 5 ); - - + + bSizerGeneraMargins->Add( bSizerDefLRMargins, 0, wxEXPAND, 5 ); - + wxBoxSizer* bSizerDefTBMargins; bSizerDefTBMargins = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerTopMargin; bSizerTopMargin = new wxBoxSizer( wxVERTICAL ); - + m_staticTextTopMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Top Margin (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTopMargin->Wrap( -1 ); bSizerTopMargin->Add( m_staticTextTopMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlTopMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerTopMargin->Add( m_textCtrlTopMargin, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerDefTBMargins->Add( bSizerTopMargin, 1, 0, 5 ); - + wxBoxSizer* bSizerDefBottomMargin; bSizerDefBottomMargin = new wxBoxSizer( wxVERTICAL ); - + m_staticTextBottomMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Bottom Margin (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextBottomMargin->Wrap( -1 ); bSizerDefBottomMargin->Add( m_staticTextBottomMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlDefaultBottomMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizerDefBottomMargin->Add( m_textCtrlDefaultBottomMargin, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bSizerDefTBMargins->Add( bSizerDefBottomMargin, 1, 0, 5 ); - - + + bSizerGeneraMargins->Add( bSizerDefTBMargins, 0, wxEXPAND, 5 ); - - + + bSizerGeneralOpts->Add( bSizerGeneraMargins, 0, 0, 5 ); - + m_buttonGeneralOptsOK = new wxButton( m_swGeneralOpts, wxID_ANY, _("Accept"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonGeneralOptsOK->SetDefault(); + m_buttonGeneralOptsOK->SetDefault(); bSizerGeneralOpts->Add( m_buttonGeneralOptsOK, 0, wxALL|wxEXPAND, 5 ); - - + + m_swGeneralOpts->SetSizer( bSizerGeneralOpts ); m_swGeneralOpts->Layout(); bSizerGeneralOpts->Fit( m_swGeneralOpts ); m_notebook->AddPage( m_swGeneralOpts, _("General Options"), false ); - + bSizerpanel->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); - - + + this->SetSizer( bSizerpanel ); this->Layout(); - + // Connect Events m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this ); m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnSetDefaultValues ), NULL, this ); @@ -634,5 +634,5 @@ PANEL_PROPERTIES_BASE::~PANEL_PROPERTIES_BASE() m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this ); m_buttonDefault->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnSetDefaultValues ), NULL, this ); m_buttonGeneralOptsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this ); - + } diff --git a/pagelayout_editor/dialogs/properties_frame_base.fbp b/pagelayout_editor/dialogs/properties_frame_base.fbp index 335e750bec..d9111034f5 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.fbp +++ b/pagelayout_editor/dialogs/properties_frame_base.fbp @@ -42,7 +42,7 @@ PANEL_PROPERTIES_BASE - 315,782 + 324,782 @@ -386,7 +386,7 @@ 0 - + 0 0 @@ -836,7 +836,7 @@ 0 - + 0 0 @@ -1579,7 +1579,7 @@ 0 - + 0 0 @@ -1764,7 +1764,7 @@ 0 - + 0 0 @@ -2043,7 +2043,7 @@ 0 - + 0 0 @@ -2228,7 +2228,7 @@ 0 - + 0 0 @@ -2658,7 +2658,7 @@ 0 - + 0 0 @@ -2940,7 +2940,7 @@ 0 - + 0 0 -1,-1 @@ -3125,7 +3125,7 @@ 0 - + 0 0 @@ -3517,7 +3517,7 @@ 0 - + 0 0 @@ -3702,7 +3702,7 @@ 0 - + 0 0 @@ -4085,7 +4085,7 @@ 0 - + 0 0 @@ -4445,7 +4445,7 @@ 0 - + 0 0 @@ -4632,7 +4632,7 @@ 0 - + 0 0 @@ -4990,7 +4990,7 @@ 0 - + 0 0 @@ -5175,7 +5175,7 @@ 0 - + 0 0 @@ -5371,7 +5371,7 @@ 0 - + 0 0 @@ -5556,7 +5556,7 @@ 0 - + 0 0 @@ -5932,7 +5932,7 @@ 0 - + 0 0 @@ -6117,7 +6117,7 @@ 0 - + 0 0 @@ -6313,7 +6313,7 @@ 0 - + 0 0 @@ -6498,7 +6498,7 @@ 0 - + 0 0 @@ -6957,7 +6957,7 @@ 0 - + 0 0 @@ -7142,7 +7142,7 @@ 0 - + 0 0 @@ -7338,7 +7338,7 @@ 0 - + 0 0 @@ -7523,7 +7523,7 @@ 0 - + 0 0 diff --git a/pagelayout_editor/dialogs/properties_frame_base.h b/pagelayout_editor/dialogs/properties_frame_base.h index 28ab1f4e23..87cc66bacd 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.h +++ b/pagelayout_editor/dialogs/properties_frame_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 9 2015) +// C++ code generated with wxFormBuilder (version May 6 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -36,10 +36,10 @@ /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_PROPERTIES_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_PROPERTIES_BASE : public wxPanel +class PANEL_PROPERTIES_BASE : public wxPanel { private: - + protected: wxNotebook* m_notebook; wxScrolledWindow* m_swItemProperties; @@ -129,17 +129,17 @@ class PANEL_PROPERTIES_BASE : public wxPanel wxStaticText* m_staticTextBottomMargin; wxTextCtrl* m_textCtrlDefaultBottomMargin; wxButton* m_buttonGeneralOptsOK; - + // Virtual event handlers, overide them in your derived class virtual void OnAcceptPrms( wxCommandEvent& event ) { event.Skip(); } virtual void OnSetDefaultValues( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 315,782 ), long style = wxTAB_TRAVERSAL ); + + PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 324,782 ), long style = wxTAB_TRAVERSAL ); ~PANEL_PROPERTIES_BASE(); - + }; #endif //__PROPERTIES_FRAME_BASE_H__ diff --git a/pcbnew/eagle_plugin.cpp b/pcbnew/eagle_plugin.cpp index ec7182a405..481430f739 100644 --- a/pcbnew/eagle_plugin.cpp +++ b/pcbnew/eagle_plugin.cpp @@ -575,8 +575,9 @@ EDIMENSION::EDIMENSION( CPTREE& aDimension ) y3 = attribs.get( "y3" ); layer = attribs.get( "layer" ); - opt_string dimensionType = attribs.get_optional( "dtype" ); - if(!dimensionType) + opt_string dimType = attribs.get_optional( "dtype" ); + + if(!dimType) { // default type is parallel } diff --git a/pcbnew/router/length_tuner_tool.cpp b/pcbnew/router/length_tuner_tool.cpp index 7c49db937f..5f53e62e54 100644 --- a/pcbnew/router/length_tuner_tool.cpp +++ b/pcbnew/router/length_tuner_tool.cpp @@ -274,7 +274,7 @@ int LENGTH_TUNER_TOOL::mainLoop( PNS_ROUTER_MODE aMode ) m_ctls->ShowCursor( true ); m_frame->UndoRedoBlock( true ); - std::auto_ptr ctxMenu( new TUNER_TOOL_MENU( m_board ) ); + std::unique_ptr ctxMenu( new TUNER_TOOL_MENU( m_board ) ); SetContextMenu( ctxMenu.get() ); // Main loop: keep receiving events diff --git a/pcbnew/router/pns_router.cpp b/pcbnew/router/pns_router.cpp index fd61578fa4..42d3d84ae5 100644 --- a/pcbnew/router/pns_router.cpp +++ b/pcbnew/router/pns_router.cpp @@ -816,7 +816,7 @@ void PNS_ROUTER::markViolations( PNS_NODE* aNode, PNS_ITEMSET& aCurrent, BOOST_FOREACH( PNS_OBSTACLE& obs, obstacles ) { int clearance = aNode->GetClearance( item, obs.m_item ); - std::auto_ptr tmp( obs.m_item->Clone() ); + std::unique_ptr tmp( obs.m_item->Clone() ); tmp->Mark( MK_VIOLATION ); DisplayItem( tmp.get(), -1, clearance ); aRemoved.push_back( obs.m_item ); diff --git a/pcbnew/router/pns_topology.cpp b/pcbnew/router/pns_topology.cpp index 3fb17b0efa..0bd9a377e4 100644 --- a/pcbnew/router/pns_topology.cpp +++ b/pcbnew/router/pns_topology.cpp @@ -98,7 +98,7 @@ bool PNS_TOPOLOGY::LeadingRatLine( const PNS_LINE* aTrack, SHAPE_LINE_CHAIN& aRa if( !track.PointCount() ) return false; - std::auto_ptr tmpNode( m_world->Branch() ); + std::unique_ptr tmpNode( m_world->Branch() ); tmpNode->Add( &track ); PNS_JOINT* jt = tmpNode->FindJoint( track.CPoint( -1 ), &track ); diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp index a58648e36a..b837ad5b70 100644 --- a/pcbnew/router/router_tool.cpp +++ b/pcbnew/router/router_tool.cpp @@ -681,7 +681,7 @@ int ROUTER_TOOL::mainLoop( PNS_ROUTER_MODE aMode ) m_startSnapPoint = getViewControls()->GetCursorPosition(); - std::auto_ptr ctxMenu( new ROUTER_TOOL_MENU( board, aMode ) ); + std::unique_ptr ctxMenu( new ROUTER_TOOL_MENU( board, aMode ) ); SetContextMenu( ctxMenu.get() ); // Main loop: keep receiving events