diff --git a/eeschema/dialogs/dialog_sch_edit_sheet_pin.fbp b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp similarity index 100% rename from eeschema/dialogs/dialog_sch_edit_sheet_pin.fbp rename to eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp diff --git a/eeschema/dialogs/dialog_sch_sheet_props.fbp b/eeschema/dialogs/dialog_sch_sheet_props.fbp index 0cd537b0b2..caa49b841e 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props.fbp +++ b/eeschema/dialogs/dialog_sch_sheet_props.fbp @@ -1,10 +1,12 @@ - + C++ 1 + source_name + 0 UTF-8 table dialog_sch_sheet_props_base @@ -16,13 +18,16 @@ . 1 + 1 1 0 wxBOTH + 1 1 + impl_virtual @@ -32,11 +37,15 @@ DIALOG_SCH_SHEET_PROPS_BASE - + 453,170 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER Schematic Sheet Properties + + wxFILTER_NONE + wxDefaultValidator + @@ -98,6 +107,7 @@ + 1 1 @@ -113,6 +123,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -144,11 +158,12 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM 5 + 1 1 @@ -156,7 +171,7 @@ wxID_ANY 0 - + 200,-1 m_textFileName protected @@ -164,6 +179,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -214,12 +233,13 @@ + 1 1 0 wxID_ANY - Te&xt size: + Si&ze: m_staticText2 @@ -229,6 +249,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -260,11 +284,12 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM 0 + 1 1 @@ -280,6 +305,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -320,6 +349,7 @@ + 1 1 @@ -335,6 +365,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -371,6 +405,7 @@ + 1 1 @@ -386,6 +421,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -417,11 +456,12 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM 5 + 1 1 @@ -437,6 +477,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -487,12 +531,13 @@ + 1 1 0 wxID_ANY - &Text size: + &Size: m_staticText5 @@ -502,6 +547,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -533,11 +582,12 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM 0 + 1 1 @@ -553,6 +603,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -593,6 +647,7 @@ + 1 1 @@ -608,6 +663,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -641,7 +700,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 0 diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp index de560e080e..3f94828df6 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp +++ b/eeschema/dialogs/dialog_sch_sheet_props_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! @@ -27,17 +27,19 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi fgSizer1->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_textFileName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_textFileName, 5, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + m_textFileName->SetMinSize( wxSize( 200,-1 ) ); + + fgSizer1->Add( m_textFileName, 5, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 ); - fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 3 ); - m_staticText2 = new wxStaticText( this, wxID_ANY, _("Te&xt size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText2 = new wxStaticText( this, wxID_ANY, _("Si&ze:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_textFileNameSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_textFileNameSize, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + fgSizer1->Add( m_textFileNameSize, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 3 ); m_staticFileNameSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticFileNameSizeUnits->Wrap( -1 ); @@ -48,17 +50,17 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi fgSizer1->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_textSheetName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_textSheetName, 5, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( m_textSheetName, 5, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 ); - fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_staticText5 = new wxStaticText( this, wxID_ANY, _("&Text size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText5 = new wxStaticText( this, wxID_ANY, _("&Size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); fgSizer1->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_textSheetNameSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_textSheetNameSize, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + fgSizer1->Add( m_textSheetNameSize, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 3 ); m_staticSheetNameSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticSheetNameSizeUnits->Wrap( -1 ); @@ -67,7 +69,7 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi mainSizer->Add( fgSizer1, 1, wxALL|wxEXPAND, 12 ); - mainSizer->Add( 0, 0, 0, wxALL|wxEXPAND, 5 ); + mainSizer->Add( 0, 0, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); @@ -79,7 +81,6 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi this->SetSizer( mainSizer ); this->Layout(); - mainSizer->Fit( this ); this->Centre( wxBOTH ); } diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.h b/eeschema/dialogs/dialog_sch_sheet_props_base.h index a7fd258ae3..75251cc320 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.h +++ b/eeschema/dialogs/dialog_sch_sheet_props_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! @@ -49,7 +49,8 @@ class DIALOG_SCH_SHEET_PROPS_BASE : public wxDialog wxButton* m_sdbSizer1Cancel; public: - DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Sheet Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Sheet Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 453,170 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_SCH_SHEET_PROPS_BASE(); }; diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp index 949942ecbf..20ac74c516 100644 --- a/eeschema/edit_label.cpp +++ b/eeschema/edit_label.cpp @@ -261,10 +261,8 @@ static void ExitMoveTexte( WinEDA_DrawPanel* Panel, wxDC* DC ) } -/* Routine to change a text type to an other one (GraphicText, label or - * Glabel). - * A new test, label or hierarchical or global label is created from the old - * text. +/* Routine to change a text type to an other one (GraphicText, label or Glabel). + * A new test, label or hierarchical or global label is created from the old text. * the old text is deleted */ void WinEDA_SchematicFrame::ConvertTextType( SCH_TEXT* Text, wxDC* DC, int newtype ) @@ -323,14 +321,14 @@ void WinEDA_SchematicFrame::ConvertTextType( SCH_TEXT* Text, wxDC* DC, int newty } /* now delete the old text - * If it is a text flagged IS_NEW it will be deleted by - * ForceCloseManageCurseur() + * If it is a text flagged IS_NEW it will be deleted by ForceCloseManageCurseur() * If not, we must delete it. */ if( DrawPanel->ManageCurseur && DrawPanel->ForceCloseManageCurseur ) { DrawPanel->ForceCloseManageCurseur( DrawPanel, DC ); } + if( (flags & IS_NEW) == 0 ) // Remove old text from current list and // save it in undo list { @@ -343,16 +341,15 @@ void WinEDA_SchematicFrame::ConvertTextType( SCH_TEXT* Text, wxDC* DC, int newty GetScreen()->SetCurItem( NULL ); - SAFE_DELETE( g_ItemToUndoCopy ); + delete g_ItemToUndoCopy; + g_ItemToUndoCopy = NULL; DrawPanel->CursorOff( DC ); // Erase schematic cursor - /* Save the new text in undo list if the old text was not itself a "new - * created text" - * In this case, the old text is already in undo list as a deleted item + /* Save the new text in undo list if the old text was not itself a "new created text" + * In this case, the old text is already in undo list as a deleted item. * Of course if the old text was a "new created text" the new text will be - * put in undo list - * later, at the end of the current command (if not aborted) + * put in undo list later, at the end of the current command (if not aborted) */ if( (flags & IS_NEW) == 0 ) { diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp index 459a535321..00fee893fe 100644 --- a/eeschema/schedit.cpp +++ b/eeschema/schedit.cpp @@ -43,6 +43,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event ) case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL: case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL: case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT: + case ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL: case ID_POPUP_SCH_SET_SHAPE_TEXT: case ID_POPUP_SCH_ROTATE_TEXT: case ID_POPUP_SCH_EDIT_SHEET: diff --git a/include/boost/boost_version.txt b/include/boost/boost_version.txt index 587a3af9e0..da3b9cda4e 100644 --- a/include/boost/boost_version.txt +++ b/include/boost/boost_version.txt @@ -1 +1 @@ -boost version: 1_44_0 +boost version: 1_45_0 diff --git a/include/boost/concept_check.hpp b/include/boost/concept_check.hpp index fcd1ae6976..4f28854dda 100644 --- a/include/boost/concept_check.hpp +++ b/include/boost/concept_check.hpp @@ -1,5 +1,7 @@ // // (C) Copyright Jeremy Siek 2000. +// Copyright 2002 The Trustees of Indiana University. +// // Distributed under the Boost Software License, Version 1.0. (See // accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -999,6 +1001,42 @@ namespace boost // HashedAssociativeContainer + BOOST_concept(Collection,(C)) + { + BOOST_CONCEPT_USAGE(Collection) + { + boost::function_requires >(); + boost::function_requires >(); + boost::function_requires >(); + const_constraints(c); + i = c.begin(); + i = c.end(); + c.swap(c); + } + + void const_constraints(const C& c) { + ci = c.begin(); + ci = c.end(); + n = c.size(); + b = c.empty(); + } + + private: + typedef typename C::value_type value_type; + typedef typename C::iterator iterator; + typedef typename C::const_iterator const_iterator; + typedef typename C::reference reference; + typedef typename C::const_reference const_reference; + // typedef typename C::pointer pointer; + typedef typename C::difference_type difference_type; + typedef typename C::size_type size_type; + + C c; + bool b; + iterator i; + const_iterator ci; + size_type n; + }; } // namespace boost # include diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp index 0bc9fc8e80..c9260f13bb 100644 --- a/include/boost/config/auto_link.hpp +++ b/include/boost/config/auto_link.hpp @@ -362,7 +362,7 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. && defined(BOOST_LIB_VERSION) #ifdef BOOST_AUTO_LINK_TAGGED -# pragma commentcomment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib") +# pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib") # ifdef BOOST_LIB_DIAGNOSTIC # pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib") # endif diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp index 2e95a6ec08..dae5dd73bd 100644 --- a/include/boost/config/compiler/borland.hpp +++ b/include/boost/config/compiler/borland.hpp @@ -46,6 +46,8 @@ // Borland C++Builder 5, command-line compiler 5.5: # define BOOST_NO_OPERATORS_IN_NAMESPACE # endif +// Variadic macros do not exist for C++ Builder versions 5 and below +#define BOOST_NO_VARIADIC_MACROS # endif // Version 5.51 and below: diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp index dc7402304d..d01c5276dd 100644 --- a/include/boost/config/compiler/clang.hpp +++ b/include/boost/config/compiler/clang.hpp @@ -48,6 +48,7 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_VARIADIC_MACROS // HACK: Clang does support extern templates, but Boost's test for // them is wrong. diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp index 8a9cc42fbb..f838947b45 100644 --- a/include/boost/config/compiler/common_edg.hpp +++ b/include/boost/config/compiler/common_edg.hpp @@ -88,12 +88,10 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_VARIADIC_MACROS #ifdef c_plusplus // EDG has "long long" in non-strict mode // However, some libraries have insufficient "long long" support // #define BOOST_HAS_LONG_LONG #endif - - - diff --git a/include/boost/config/compiler/digitalmars.hpp b/include/boost/config/compiler/digitalmars.hpp index 0b7fee5d4e..3ec44e15dd 100644 --- a/include/boost/config/compiler/digitalmars.hpp +++ b/include/boost/config/compiler/digitalmars.hpp @@ -80,6 +80,9 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES +#if (__DMC__ < 0x812) +#define BOOST_NO_VARIADIC_MACROS +#endif #if __DMC__ < 0x800 #error "Compiler not supported or configured - please reconfigure" diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp index 61fdde5212..bb038c8fa8 100644 --- a/include/boost/config/compiler/gcc.hpp +++ b/include/boost/config/compiler/gcc.hpp @@ -43,6 +43,8 @@ # define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL # define BOOST_NO_IS_ABSTRACT # define BOOST_NO_EXTERN_TEMPLATE +// Variadic macros do not exist for gcc versions before 3.0 +# define BOOST_NO_VARIADIC_MACROS #elif __GNUC__ == 3 # if defined (__PATHSCALE__) # define BOOST_NO_TWO_PHASE_NAME_LOOKUP @@ -113,7 +115,7 @@ // Dynamic shared object (DSO) and dynamic-link library (DLL) support // #if __GNUC__ >= 4 -# if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) +# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && !defined(__CYGWIN__) // All Win32 development environments, including 64-bit Windows and MinGW, define // _WIN32 or one of its variant spellings. Note that Cygwin is a POSIX environment, // so does not define _WIN32 or its variants. diff --git a/include/boost/config/compiler/gcc_xml.hpp b/include/boost/config/compiler/gcc_xml.hpp index b10550ab3b..8b57952c66 100644 --- a/include/boost/config/compiler/gcc_xml.hpp +++ b/include/boost/config/compiler/gcc_xml.hpp @@ -35,6 +35,7 @@ # define BOOST_NO_RVALUE_REFERENCES # define BOOST_NO_STATIC_ASSERT # define BOOST_NO_VARIADIC_TEMPLATES +# define BOOST_NO_VARIADIC_MACROS # define BOOST_NO_AUTO_DECLARATIONS # define BOOST_NO_AUTO_MULTIDECLARATIONS # define BOOST_NO_CHAR16_T diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp index 66bbb465ba..1cc457b7ca 100644 --- a/include/boost/config/compiler/hp_acc.hpp +++ b/include/boost/config/compiler/hp_acc.hpp @@ -115,6 +115,16 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES + +/* + See https://forums13.itrc.hp.com/service/forums/questionanswer.do?threadId=1443331 and + https://forums13.itrc.hp.com/service/forums/questionanswer.do?threadId=1443436 +*/ + +#if (__HP_aCC < 62500) || !defined(HP_CXX0x_SOURCE) + #define BOOST_NO_VARIADIC_MACROS +#endif + #endif // diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp index 3d906e7e05..df7893d81e 100644 --- a/include/boost/config/compiler/metrowerks.hpp +++ b/include/boost/config/compiler/metrowerks.hpp @@ -114,6 +114,7 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_VARIADIC_MACROS #define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION) diff --git a/include/boost/config/compiler/mpw.hpp b/include/boost/config/compiler/mpw.hpp index abdbc4690c..049251bc94 100644 --- a/include/boost/config/compiler/mpw.hpp +++ b/include/boost/config/compiler/mpw.hpp @@ -63,6 +63,7 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_VARIADIC_MACROS // // versions check: diff --git a/include/boost/config/compiler/nvcc.hpp b/include/boost/config/compiler/nvcc.hpp index fb0af4d3d7..3988f70c5a 100644 --- a/include/boost/config/compiler/nvcc.hpp +++ b/include/boost/config/compiler/nvcc.hpp @@ -37,6 +37,7 @@ #define BOOST_HAS_DIRENT_H #define BOOST_HAS_CLOCK_GETTIME #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_VARIADIC_MACROS #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_STD_UNORDERED diff --git a/include/boost/config/compiler/pgi.hpp b/include/boost/config/compiler/pgi.hpp index 625872e290..add5a4d7f4 100644 --- a/include/boost/config/compiler/pgi.hpp +++ b/include/boost/config/compiler/pgi.hpp @@ -70,6 +70,7 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_VARIADIC_MACROS // // version check: diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp index 1d6520a25c..2fc886611f 100644 --- a/include/boost/config/compiler/sunpro_cc.hpp +++ b/include/boost/config/compiler/sunpro_cc.hpp @@ -122,6 +122,7 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_VARIADIC_MACROS // // Version diff --git a/include/boost/config/compiler/vacpp.hpp b/include/boost/config/compiler/vacpp.hpp index e8712ca815..8f9465fdf9 100644 --- a/include/boost/config/compiler/vacpp.hpp +++ b/include/boost/config/compiler/vacpp.hpp @@ -91,6 +91,7 @@ #define BOOST_NO_TEMPLATE_ALIASES #define BOOST_NO_UNICODE_LITERALS #define BOOST_NO_VARIADIC_TEMPLATES +#define BOOST_NO_VARIADIC_MACROS diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index 9a9e21eaf4..a077e99234 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -81,6 +81,8 @@ # define BOOST_NO_SWPRINTF // Our extern template tests also fail for this compiler: # define BOOST_NO_EXTERN_TEMPLATE +// Variadic macros do not exist for VC7.1 and lower +# define BOOST_NO_VARIADIC_MACROS #endif #if defined(UNDER_CE) diff --git a/include/boost/config/platform/bsd.hpp b/include/boost/config/platform/bsd.hpp index a1ef7c300b..9d86e940f2 100644 --- a/include/boost/config/platform/bsd.hpp +++ b/include/boost/config/platform/bsd.hpp @@ -56,7 +56,7 @@ #endif #if !((defined(__FreeBSD__) && (__FreeBSD__ >= 5)) \ - || (__NetBSD_GCC__ >= 2095003) || defined(__DragonFly__)) + || (defined(__NetBSD_GCC__) && (__NetBSD_GCC__ >= 2095003)) || defined(__DragonFly__)) # define BOOST_NO_CWCHAR #endif // diff --git a/include/boost/config/platform/cygwin.hpp b/include/boost/config/platform/cygwin.hpp index 06f778ff8f..7949fc55b3 100644 --- a/include/boost/config/platform/cygwin.hpp +++ b/include/boost/config/platform/cygwin.hpp @@ -41,6 +41,13 @@ // boilerplate code: #include + +// +// Cygwin lies about XSI conformance, there is no nl_types.h: +// +#ifdef BOOST_HAS_NL_TYPES_H +# undef BOOST_HAS_NL_TYPES_H +#endif diff --git a/include/boost/config/select_platform_config.hpp b/include/boost/config/select_platform_config.hpp index d7ff061759..0052222061 100644 --- a/include/boost/config/select_platform_config.hpp +++ b/include/boost/config/select_platform_config.hpp @@ -69,6 +69,9 @@ // Symbian: # define BOOST_PLATFORM_CONFIG "boost/config/platform/symbian.hpp" +#elif defined(__VMS) +// VMS: +# define BOOST_PLATFORM_CONFIG "boost/config/platform/vms.hpp" #else # if defined(unix) \ diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp index 17d4dccd4b..252e6ce4eb 100644 --- a/include/boost/config/stdlib/dinkumware.hpp +++ b/include/boost/config/stdlib/dinkumware.hpp @@ -125,6 +125,7 @@ # define BOOST_NO_0X_HDR_MUTEX # define BOOST_NO_0X_HDR_RATIO # define BOOST_NO_0X_HDR_THREAD +# define BOOST_NO_NUMERIC_LIMITS_LOWEST #ifdef _CPPLIB_VER # define BOOST_DINKUMWARE_STDLIB _CPPLIB_VER diff --git a/include/boost/config/stdlib/libcomo.hpp b/include/boost/config/stdlib/libcomo.hpp index eed3dbf710..8ed4cd8dbb 100644 --- a/include/boost/config/stdlib/libcomo.hpp +++ b/include/boost/config/stdlib/libcomo.hpp @@ -58,6 +58,7 @@ # define BOOST_NO_STD_UNORDERED // deprecated; see following # define BOOST_NO_0X_HDR_UNORDERED_MAP # define BOOST_NO_0X_HDR_UNORDERED_SET +# define BOOST_NO_NUMERIC_LIMITS_LOWEST // // Intrinsic type_traits support. diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp index 2d4e33fdb3..ae87cf64ac 100644 --- a/include/boost/config/stdlib/libstdcpp3.hpp +++ b/include/boost/config/stdlib/libstdcpp3.hpp @@ -115,6 +115,12 @@ # define BOOST_NO_0X_HDR_THREAD #endif +// C++0x features in GCC 4.5.0 and later +// +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__) +# define BOOST_NO_NUMERIC_LIMITS_LOWEST +#endif + // C++0x headers not yet implemented // # define BOOST_NO_0X_HDR_CODECVT diff --git a/include/boost/config/stdlib/modena.hpp b/include/boost/config/stdlib/modena.hpp index 2699e0b147..0299a5b5f4 100644 --- a/include/boost/config/stdlib/modena.hpp +++ b/include/boost/config/stdlib/modena.hpp @@ -47,6 +47,7 @@ # define BOOST_NO_STD_UNORDERED // deprecated; see following # define BOOST_NO_0X_HDR_UNORDERED_MAP # define BOOST_NO_0X_HDR_UNORDERED_SET +# define BOOST_NO_NUMERIC_LIMITS_LOWEST #define BOOST_STDLIB "Modena C++ standard library" diff --git a/include/boost/config/stdlib/msl.hpp b/include/boost/config/stdlib/msl.hpp index edc1040732..89ae7db1e3 100644 --- a/include/boost/config/stdlib/msl.hpp +++ b/include/boost/config/stdlib/msl.hpp @@ -71,6 +71,7 @@ # define BOOST_NO_STD_UNORDERED // deprecated; see following # define BOOST_NO_0X_HDR_UNORDERED_MAP # define BOOST_NO_0X_HDR_UNORDERED_SET +# define BOOST_NO_NUMERIC_LIMITS_LOWEST #define BOOST_STDLIB "Metrowerks Standard Library version " BOOST_STRINGIZE(__MSL_CPP__) diff --git a/include/boost/config/stdlib/roguewave.hpp b/include/boost/config/stdlib/roguewave.hpp index cbbb9f2be5..d4b1f75693 100644 --- a/include/boost/config/stdlib/roguewave.hpp +++ b/include/boost/config/stdlib/roguewave.hpp @@ -177,4 +177,5 @@ # define BOOST_NO_STD_UNORDERED // deprecated; see following # define BOOST_NO_0X_HDR_UNORDERED_MAP # define BOOST_NO_0X_HDR_UNORDERED_SET +# define BOOST_NO_NUMERIC_LIMITS_LOWEST diff --git a/include/boost/config/stdlib/sgi.hpp b/include/boost/config/stdlib/sgi.hpp index 10731a167d..55d42a2e2d 100644 --- a/include/boost/config/stdlib/sgi.hpp +++ b/include/boost/config/stdlib/sgi.hpp @@ -130,6 +130,7 @@ # define BOOST_NO_STD_UNORDERED // deprecated; see following # define BOOST_NO_0X_HDR_UNORDERED_MAP # define BOOST_NO_0X_HDR_UNORDERED_SET +# define BOOST_NO_NUMERIC_LIMITS_LOWEST #define BOOST_STDLIB "SGI standard library" diff --git a/include/boost/config/stdlib/stlport.hpp b/include/boost/config/stdlib/stlport.hpp index a9669533e0..b8eafe09fd 100644 --- a/include/boost/config/stdlib/stlport.hpp +++ b/include/boost/config/stdlib/stlport.hpp @@ -225,6 +225,7 @@ namespace boost { using std::min; using std::max; } # define BOOST_NO_STD_UNORDERED // deprecated; see following # define BOOST_NO_0X_HDR_UNORDERED_MAP # define BOOST_NO_0X_HDR_UNORDERED_SET +# define BOOST_NO_NUMERIC_LIMITS_LOWEST #define BOOST_STDLIB "STLPort standard library version " BOOST_STRINGIZE(__SGI_STL_PORT) diff --git a/include/boost/config/stdlib/vacpp.hpp b/include/boost/config/stdlib/vacpp.hpp index 0a054f8e5c..e0807eb0dc 100644 --- a/include/boost/config/stdlib/vacpp.hpp +++ b/include/boost/config/stdlib/vacpp.hpp @@ -37,6 +37,7 @@ # define BOOST_NO_STD_UNORDERED // deprecated; see following # define BOOST_NO_0X_HDR_UNORDERED_MAP # define BOOST_NO_0X_HDR_UNORDERED_SET +# define BOOST_NO_NUMERIC_LIMITS_LOWEST #define BOOST_STDLIB "Visual Age default standard library" diff --git a/include/boost/config/suffix.hpp b/include/boost/config/suffix.hpp index 2af781f403..99e6ce2419 100644 --- a/include/boost/config/suffix.hpp +++ b/include/boost/config/suffix.hpp @@ -25,6 +25,14 @@ #ifndef BOOST_CONFIG_SUFFIX_HPP #define BOOST_CONFIG_SUFFIX_HPP +#if defined(__GNUC__) && (__GNUC__ >= 4) +// +// Some GCC-4.x versions issue warnings even when __extension__ is used, +// so use this as a workaround: +// +#pragma GCC system_header +#endif + // // ensure that visibility macros are always defined, thus symplifying use // diff --git a/include/boost/detail/is_incrementable.hpp b/include/boost/detail/is_incrementable.hpp index 8ad142cd76..54cdfb97ce 100644 --- a/include/boost/detail/is_incrementable.hpp +++ b/include/boost/detail/is_incrementable.hpp @@ -70,10 +70,10 @@ namespace is_incrementable_ # endif // two check overloads help us identify which operator++ was picked - char (& check(tag) )[2]; + char (& check_(tag) )[2]; template - char check(T const&); + char check_(T const&); template @@ -83,7 +83,7 @@ namespace is_incrementable_ BOOST_STATIC_CONSTANT( bool - , value = sizeof(is_incrementable_::check(BOOST_comma(++x,0))) == 1 + , value = sizeof(is_incrementable_::check_(BOOST_comma(++x,0))) == 1 ); }; @@ -94,7 +94,7 @@ namespace is_incrementable_ BOOST_STATIC_CONSTANT( bool - , value = sizeof(is_incrementable_::check(BOOST_comma(x++,0))) == 1 + , value = sizeof(is_incrementable_::check_(BOOST_comma(x++,0))) == 1 ); }; diff --git a/include/boost/detail/sp_typeinfo.hpp b/include/boost/detail/sp_typeinfo.hpp index c8db66d14c..50da7aa73f 100644 --- a/include/boost/detail/sp_typeinfo.hpp +++ b/include/boost/detail/sp_typeinfo.hpp @@ -74,7 +74,13 @@ template struct sp_typeid_ } }; +#if defined(__SUNPRO_CC) +// see #4199, the Sun Studio compiler gets confused about static initialization +// constructor arguments. But an assignment works just fine. template sp_typeinfo sp_typeid_< T >::ti_ = sp_typeid_< T >::name(); +#else +template sp_typeinfo sp_typeid_< T >::ti_(sp_typeid_< T >::name()); +#endif template struct sp_typeid_< T & >: sp_typeid_< T > { diff --git a/include/boost/foreach.hpp b/include/boost/foreach.hpp index 6bbc3a9993..9a52e299a0 100644 --- a/include/boost/foreach.hpp +++ b/include/boost/foreach.hpp @@ -246,7 +246,7 @@ struct auto_any_base template struct auto_any : auto_any_base { - auto_any(T const &t) + explicit auto_any(T const &t) : item(t) { } @@ -606,7 +606,7 @@ should_copy_impl(boost::mpl::false_ *, boost::mpl::false_ *, bool *is_rvalue) template inline auto_any contain(T const &t, boost::mpl::true_ *) // rvalue { - return t; + return auto_any(t); } template @@ -614,18 +614,18 @@ inline auto_any contain(T &t, boost::mpl::false_ *) // lvalue { // Cannot seem to get sunpro to handle addressof() with array types. #if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x570)) - return &t; + return auto_any(&t); #else - return boost::addressof(t); + return auto_any(boost::addressof(t)); #endif } #ifdef BOOST_FOREACH_RUN_TIME_CONST_RVALUE_DETECTION template -auto_any > +inline auto_any > contain(T const &t, bool *rvalue) { - return *rvalue ? simple_variant(t) : simple_variant(&t); + return auto_any >(*rvalue ? simple_variant(t) : simple_variant(&t)); } #endif @@ -636,7 +636,8 @@ template inline auto_any::type> begin(auto_any_t col, type2type *, boost::mpl::true_ *) // rvalue { - return boost::begin(auto_any_cast(col)); + return auto_any::type>( + boost::begin(auto_any_cast(col))); } template @@ -645,15 +646,17 @@ begin(auto_any_t col, type2type *, boost::mpl::false_ *) // lvalue { typedef BOOST_DEDUCED_TYPENAME type2type::type type; typedef BOOST_DEDUCED_TYPENAME foreach_iterator::type iterator; - return iterator(boost::begin(derefof(auto_any_cast(col)))); + return auto_any::type>( + iterator(boost::begin(derefof(auto_any_cast(col))))); } #ifdef BOOST_FOREACH_RUN_TIME_CONST_RVALUE_DETECTION template -auto_any::type> +inline auto_any::type> begin(auto_any_t col, type2type *, bool *) { - return boost::begin(*auto_any_cast, boost::mpl::false_>(col).get()); + return auto_any::type>( + boost::begin(*auto_any_cast, boost::mpl::false_>(col).get())); } #endif @@ -662,7 +665,7 @@ template inline auto_any begin(auto_any_t col, type2type *, boost::mpl::true_ *) // null-terminated C-style strings { - return auto_any_cast(col); + return auto_any(auto_any_cast(col)); } #endif @@ -673,7 +676,8 @@ template inline auto_any::type> end(auto_any_t col, type2type *, boost::mpl::true_ *) // rvalue { - return boost::end(auto_any_cast(col)); + return auto_any::type>( + boost::end(auto_any_cast(col))); } template @@ -682,15 +686,17 @@ end(auto_any_t col, type2type *, boost::mpl::false_ *) // lvalue { typedef BOOST_DEDUCED_TYPENAME type2type::type type; typedef BOOST_DEDUCED_TYPENAME foreach_iterator::type iterator; - return iterator(boost::end(derefof(auto_any_cast(col)))); + return auto_any::type>( + iterator(boost::end(derefof(auto_any_cast(col))))); } #ifdef BOOST_FOREACH_RUN_TIME_CONST_RVALUE_DETECTION template -auto_any::type> +inline auto_any::type> end(auto_any_t col, type2type *, bool *) { - return boost::end(*auto_any_cast, boost::mpl::false_>(col).get()); + return auto_any::type>( + boost::end(*auto_any_cast, boost::mpl::false_>(col).get())); } #endif @@ -699,7 +705,7 @@ template inline auto_any end(auto_any_t, type2type *, boost::mpl::true_ *) // null-terminated C-style strings { - return 0; // not used + return auto_any(0); // not used } #endif @@ -749,7 +755,8 @@ template inline auto_any::type> rbegin(auto_any_t col, type2type *, boost::mpl::true_ *) // rvalue { - return boost::rbegin(auto_any_cast(col)); + return auto_any::type>( + boost::rbegin(auto_any_cast(col))); } template @@ -758,15 +765,17 @@ rbegin(auto_any_t col, type2type *, boost::mpl::false_ *) // lvalue { typedef BOOST_DEDUCED_TYPENAME type2type::type type; typedef BOOST_DEDUCED_TYPENAME foreach_reverse_iterator::type iterator; - return iterator(boost::rbegin(derefof(auto_any_cast(col)))); + return auto_any::type>( + iterator(boost::rbegin(derefof(auto_any_cast(col))))); } #ifdef BOOST_FOREACH_RUN_TIME_CONST_RVALUE_DETECTION template -auto_any::type> +inline auto_any::type> rbegin(auto_any_t col, type2type *, bool *) { - return boost::rbegin(*auto_any_cast, boost::mpl::false_>(col).get()); + return auto_any::type>( + boost::rbegin(*auto_any_cast, boost::mpl::false_>(col).get())); } #endif @@ -778,7 +787,7 @@ rbegin(auto_any_t col, type2type *, boost::mpl::true_ *) // null-termina T *p = auto_any_cast(col); while(0 != *p) ++p; - return reverse_iterator(p); + return auto_any >(reverse_iterator(p)); } #endif @@ -789,7 +798,8 @@ template inline auto_any::type> rend(auto_any_t col, type2type *, boost::mpl::true_ *) // rvalue { - return boost::rend(auto_any_cast(col)); + return auto_any::type>( + boost::rend(auto_any_cast(col))); } template @@ -798,15 +808,17 @@ rend(auto_any_t col, type2type *, boost::mpl::false_ *) // lvalue { typedef BOOST_DEDUCED_TYPENAME type2type::type type; typedef BOOST_DEDUCED_TYPENAME foreach_reverse_iterator::type iterator; - return iterator(boost::rend(derefof(auto_any_cast(col)))); + return auto_any::type>( + iterator(boost::rend(derefof(auto_any_cast(col))))); } #ifdef BOOST_FOREACH_RUN_TIME_CONST_RVALUE_DETECTION template -auto_any::type> +inline auto_any::type> rend(auto_any_t col, type2type *, bool *) { - return boost::rend(*auto_any_cast, boost::mpl::false_>(col).get()); + return auto_any::type>( + boost::rend(*auto_any_cast, boost::mpl::false_>(col).get())); } #endif @@ -815,7 +827,8 @@ template inline auto_any > rend(auto_any_t col, type2type *, boost::mpl::true_ *) // null-terminated C-style strings { - return reverse_iterator(auto_any_cast(col)); + return auto_any >( + reverse_iterator(auto_any_cast(col))); } #endif diff --git a/include/boost/polygon/detail/scan_arbitrary.hpp b/include/boost/polygon/detail/scan_arbitrary.hpp index b26455f50f..7a4d0de6e3 100644 --- a/include/boost/polygon/detail/scan_arbitrary.hpp +++ b/include/boost/polygon/detail/scan_arbitrary.hpp @@ -192,6 +192,8 @@ namespace boost { namespace polygon{ if(pack_.compute_intersection(intersection, he1, he2)) { //their intersection point pts.push_back(intersection); + intersection_points[(*inner).second].insert(intersection); + intersection_points[(*outer).second].insert(intersection); } } } diff --git a/include/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp b/include/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp index af45f50a8a..a4cf9e7d43 100644 --- a/include/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp +++ b/include/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace boost { diff --git a/include/boost/ptr_container/detail/serialize_reversible_cont.hpp b/include/boost/ptr_container/detail/serialize_reversible_cont.hpp index cd3ad251bc..ff16c152ed 100644 --- a/include/boost/ptr_container/detail/serialize_reversible_cont.hpp +++ b/include/boost/ptr_container/detail/serialize_reversible_cont.hpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace boost { diff --git a/include/boost/smart_ptr/detail/sp_convertible.hpp b/include/boost/smart_ptr/detail/sp_convertible.hpp index a7733481dd..6270b79466 100644 --- a/include/boost/smart_ptr/detail/sp_convertible.hpp +++ b/include/boost/smart_ptr/detail/sp_convertible.hpp @@ -45,7 +45,7 @@ template< class Y, class T > struct sp_convertible static yes f( T* ); static no f( ... ); - enum _vt { value = sizeof( f( static_cast(0) ) ) == sizeof(yes) }; + enum _vt { value = sizeof( (f)( static_cast(0) ) ) == sizeof(yes) }; }; struct sp_empty diff --git a/include/boost/smart_ptr/detail/yield_k.hpp b/include/boost/smart_ptr/detail/yield_k.hpp index 7fafea7d38..4f174bb31b 100644 --- a/include/boost/smart_ptr/detail/yield_k.hpp +++ b/include/boost/smart_ptr/detail/yield_k.hpp @@ -55,7 +55,7 @@ namespace detail { #if !defined( BOOST_USE_WINDOWS_H ) - extern "C" void __stdcall Sleep( unsigned ms ); + extern "C" void __stdcall Sleep( unsigned long ms ); #endif inline void yield( unsigned k ) diff --git a/include/boost/smart_ptr/make_shared.hpp b/include/boost/smart_ptr/make_shared.hpp index 5df6cee220..6322b04a4b 100644 --- a/include/boost/smart_ptr/make_shared.hpp +++ b/include/boost/smart_ptr/make_shared.hpp @@ -87,10 +87,12 @@ public: }; #if defined( BOOST_HAS_RVALUE_REFS ) -template< class T > T&& forward( T &&t ) + +template< class T > T&& sp_forward( T & t ) { - return t; + return static_cast< T&& >( t ); } + #endif } // namespace detail @@ -101,9 +103,9 @@ template< class T > T&& forward( T &&t ) template< class T > boost::shared_ptr< T > make_shared() { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -118,9 +120,9 @@ template< class T > boost::shared_ptr< T > make_shared() template< class T, class A > boost::shared_ptr< T > allocate_shared( A const & a ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -137,15 +139,15 @@ template< class T, class A > boost::shared_ptr< T > allocate_shared( A const & a // Variadic templates, rvalue reference -template< class T, class... Args > boost::shared_ptr< T > make_shared( Args && ... args ) +template< class T, class Arg1, class... Args > boost::shared_ptr< T > make_shared( Arg1 && arg1, Args && ... args ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); - ::new( pv ) T( detail::forward( args )... ); + ::new( pv ) T( boost::detail::sp_forward( arg1 ), boost::detail::sp_forward( args )... ); pd->set_initialized(); T * pt2 = static_cast< T* >( pv ); @@ -154,15 +156,15 @@ template< class T, class... Args > boost::shared_ptr< T > make_shared( Args && . return boost::shared_ptr< T >( pt, pt2 ); } -template< class T, class A, class... Args > boost::shared_ptr< T > allocate_shared( A const & a, Args && ... args ) +template< class T, class A, class Arg1, class... Args > boost::shared_ptr< T > allocate_shared( A const & a, Arg1 && arg1, Args && ... args ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); - ::new( pv ) T( detail::forward( args )... ); + ::new( pv ) T( boost::detail::sp_forward( arg1 ), boost::detail::sp_forward( args )... ); pd->set_initialized(); T * pt2 = static_cast< T* >( pv ); @@ -178,9 +180,9 @@ template< class T, class A, class... Args > boost::shared_ptr< T > allocate_shar template< class T, class A1 > boost::shared_ptr< T > make_shared( A1 const & a1 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -196,9 +198,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1 ) template< class T, class A, class A1 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -214,9 +216,9 @@ boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1 ) template< class T, class A1, class A2 > boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -232,9 +234,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2 ) template< class T, class A, class A1, class A2 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a2 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -250,9 +252,9 @@ boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a template< class T, class A1, class A2, class A3 > boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -268,9 +270,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3 template< class T, class A, class A1, class A2, class A3 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -286,9 +288,9 @@ boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a template< class T, class A1, class A2, class A3, class A4 > boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -304,9 +306,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, template< class T, class A, class A1, class A2, class A3, class A4 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -322,9 +324,9 @@ boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a template< class T, class A1, class A2, class A3, class A4, class A5 > boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -340,9 +342,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, template< class T, class A, class A1, class A2, class A3, class A4, class A5 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -358,9 +360,9 @@ boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a template< class T, class A1, class A2, class A3, class A4, class A5, class A6 > boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -376,9 +378,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -394,9 +396,9 @@ boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7 > boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -412,9 +414,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -430,9 +432,9 @@ boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -448,9 +450,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -466,9 +468,9 @@ boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a template< class T, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 > boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >() ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >() ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); @@ -484,9 +486,9 @@ boost::shared_ptr< T > make_shared( A1 const & a1, A2 const & a2, A3 const & a3, template< class T, class A, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9 > boost::shared_ptr< T > allocate_shared( A const & a, A1 const & a1, A2 const & a2, A3 const & a3, A4 const & a4, A5 const & a5, A6 const & a6, A7 const & a7, A8 const & a8, A9 const & a9 ) { - boost::shared_ptr< T > pt( static_cast< T* >( 0 ), detail::sp_ms_deleter< T >(), a ); + boost::shared_ptr< T > pt( static_cast< T* >( 0 ), boost::detail::sp_ms_deleter< T >(), a ); - detail::sp_ms_deleter< T > * pd = boost::get_deleter< detail::sp_ms_deleter< T > >( pt ); + boost::detail::sp_ms_deleter< T > * pd = boost::get_deleter< boost::detail::sp_ms_deleter< T > >( pt ); void * pv = pd->address(); diff --git a/include/boost/type_traits/intrinsics.hpp b/include/boost/type_traits/intrinsics.hpp index e3a95186f0..8f388a0d93 100644 --- a/include/boost/type_traits/intrinsics.hpp +++ b/include/boost/type_traits/intrinsics.hpp @@ -159,6 +159,33 @@ # define BOOST_HAS_TYPE_TRAITS_INTRINSICS #endif +#if defined(__ghs__) && (__GHS_VERSION_NUMBER >= 600) +# include +# include +# include + +# define BOOST_IS_UNION(T) __is_union(T) +# define BOOST_IS_POD(T) __is_pod(T) +# define BOOST_IS_EMPTY(T) __is_empty(T) +# define BOOST_HAS_TRIVIAL_CONSTRUCTOR(T) __has_trivial_constructor(T) +# define BOOST_HAS_TRIVIAL_COPY(T) (__has_trivial_copy(T) && !is_reference::value) +# define BOOST_HAS_TRIVIAL_ASSIGN(T) __has_trivial_assign(T) +# define BOOST_HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T) +# define BOOST_HAS_NOTHROW_CONSTRUCTOR(T) __has_nothrow_constructor(T) +# define BOOST_HAS_NOTHROW_COPY(T) (__has_nothrow_copy(T) && !is_volatile::value && !is_reference::value) +# define BOOST_HAS_NOTHROW_ASSIGN(T) (__has_nothrow_assign(T) && !is_volatile::value) +# define BOOST_HAS_VIRTUAL_DESTRUCTOR(T) __has_virtual_destructor(T) + +# define BOOST_IS_ABSTRACT(T) __is_abstract(T) +# define BOOST_IS_BASE_OF(T,U) (__is_base_of(T,U) && !is_same::value) +# define BOOST_IS_CLASS(T) __is_class(T) +# define BOOST_IS_ENUM(T) __is_enum(T) +# define BOOST_IS_POLYMORPHIC(T) __is_polymorphic(T) +# define BOOST_ALIGNMENT_OF(T) __alignof__(T) + +# define BOOST_HAS_TYPE_TRAITS_INTRINSICS +#endif + # if defined(__CODEGEARC__) # include # include diff --git a/include/boost/type_traits/is_signed.hpp b/include/boost/type_traits/is_signed.hpp index 13b340ca01..77562a107e 100644 --- a/include/boost/type_traits/is_signed.hpp +++ b/include/boost/type_traits/is_signed.hpp @@ -24,14 +24,19 @@ namespace boost { namespace detail{ -#if !(defined(__EDG_VERSION__) && __EDG_VERSION__ <= 238) +#if !(defined(__EDG_VERSION__) && __EDG_VERSION__ <= 238) && !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION) template struct is_signed_values { + // + // Note that we cannot use BOOST_STATIC_CONSTANT here, using enum's + // rather than "real" static constants simply doesn't work or give + // the correct answer. + // typedef typename remove_cv::type no_cv_t; - BOOST_STATIC_CONSTANT(no_cv_t, minus_one = (static_cast(-1))); - BOOST_STATIC_CONSTANT(no_cv_t, zero = (static_cast(0))); + static const no_cv_t minus_one = (static_cast(-1)); + static const no_cv_t zero = (static_cast(0)); }; template diff --git a/include/boost/type_traits/is_unsigned.hpp b/include/boost/type_traits/is_unsigned.hpp index dc29113f73..be79b15d71 100644 --- a/include/boost/type_traits/is_unsigned.hpp +++ b/include/boost/type_traits/is_unsigned.hpp @@ -24,14 +24,19 @@ namespace boost { namespace detail{ -#if !(defined(__EDG_VERSION__) && __EDG_VERSION__ <= 238) +#if !(defined(__EDG_VERSION__) && __EDG_VERSION__ <= 238) && !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION) template struct is_unsigned_values { + // + // Note that we cannot use BOOST_STATIC_CONSTANT here, using enum's + // rather than "real" static constants simply doesn't work or give + // the correct answer. + // typedef typename remove_cv::type no_cv_t; - BOOST_STATIC_CONSTANT(no_cv_t, minus_one = (static_cast(-1))); - BOOST_STATIC_CONSTANT(no_cv_t, zero = (static_cast(0))); + static const no_cv_t minus_one = (static_cast(-1)); + static const no_cv_t zero = (static_cast(0)); }; template diff --git a/include/boost/type_traits/is_virtual_base_of.hpp b/include/boost/type_traits/is_virtual_base_of.hpp index 006e1c6e29..d6e6f01159 100644 --- a/include/boost/type_traits/is_virtual_base_of.hpp +++ b/include/boost/type_traits/is_virtual_base_of.hpp @@ -37,37 +37,37 @@ template struct is_virtual_base_of_impl { #ifdef __BORLANDC__ - struct X : public virtual Derived, public virtual Base + struct boost_type_traits_internal_struct_X : public virtual Derived, public virtual Base { - X(); - X(const X&); - X& operator=(const X&); - ~X()throw(); + boost_type_traits_internal_struct_X(); + boost_type_traits_internal_struct_X(const boost_type_traits_internal_struct_X&); + boost_type_traits_internal_struct_X& operator=(const boost_type_traits_internal_struct_X&); + ~boost_type_traits_internal_struct_X()throw(); }; - struct Y : public virtual Derived + struct boost_type_traits_internal_struct_Y : public virtual Derived { - Y(); - Y(const Y&); - Y& operator=(const Y&); - ~Y()throw(); + boost_type_traits_internal_struct_Y(); + boost_type_traits_internal_struct_Y(const boost_type_traits_internal_struct_Y&); + boost_type_traits_internal_struct_Y& operator=(const boost_type_traits_internal_struct_Y&); + ~boost_type_traits_internal_struct_Y()throw(); }; #else - struct X : Derived, virtual Base + struct boost_type_traits_internal_struct_X : Derived, virtual Base { - X(); - X(const X&); - X& operator=(const X&); - ~X()throw(); + boost_type_traits_internal_struct_X(); + boost_type_traits_internal_struct_X(const boost_type_traits_internal_struct_X&); + boost_type_traits_internal_struct_X& operator=(const boost_type_traits_internal_struct_X&); + ~boost_type_traits_internal_struct_X()throw(); }; - struct Y : Derived + struct boost_type_traits_internal_struct_Y : Derived { - Y(); - Y(const Y&); - Y& operator=(const Y&); - ~Y()throw(); + boost_type_traits_internal_struct_Y(); + boost_type_traits_internal_struct_Y(const boost_type_traits_internal_struct_Y&); + boost_type_traits_internal_struct_Y& operator=(const boost_type_traits_internal_struct_Y&); + ~boost_type_traits_internal_struct_Y()throw(); }; #endif - BOOST_STATIC_CONSTANT(bool, value = (sizeof(X)==sizeof(Y))); + BOOST_STATIC_CONSTANT(bool, value = (sizeof(boost_type_traits_internal_struct_X)==sizeof(boost_type_traits_internal_struct_Y))); }; template diff --git a/include/boost/typeof/message.hpp b/include/boost/typeof/message.hpp index 3b2697e83e..ae0cf51bec 100644 --- a/include/boost/typeof/message.hpp +++ b/include/boost/typeof/message.hpp @@ -2,7 +2,7 @@ // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt) -#if defined(_MSC_VER) && !defined BOOST_TYPEOF_SILENT +#if defined(_MSC_VER) && defined BOOST_TYPEOF_MESSAGES # pragma message(BOOST_TYPEOF_TEXT) #endif #undef BOOST_TYPEOF_TEXT diff --git a/include/boost/typeof/register_functions.hpp b/include/boost/typeof/register_functions.hpp index cad6f3fe8e..5ef8ade52d 100644 --- a/include/boost/typeof/register_functions.hpp +++ b/include/boost/typeof/register_functions.hpp @@ -24,12 +24,19 @@ enum { FUN_ID = BOOST_TYPEOF_UNIQUE_ID(), - FUN_PTR_ID = FUN_ID + 1 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), - FUN_REF_ID = FUN_ID + 2 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), - MEM_FUN_ID = FUN_ID + 3 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), - CONST_MEM_FUN_ID = FUN_ID + 4 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), - VOLATILE_MEM_FUN_ID = FUN_ID + 5 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), - VOLATILE_CONST_MEM_FUN_ID = FUN_ID + 6 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY) + FUN_PTR_ID = FUN_ID + 1 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + FUN_REF_ID = FUN_ID + 2 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + MEM_FUN_ID = FUN_ID + 3 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + CONST_MEM_FUN_ID = FUN_ID + 4 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + VOLATILE_MEM_FUN_ID = FUN_ID + 5 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + VOLATILE_CONST_MEM_FUN_ID = FUN_ID + 6 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + FUN_VAR_ID = FUN_ID + 7 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + FUN_VAR_PTR_ID = FUN_ID + 8 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + FUN_VAR_REF_ID = FUN_ID + 9 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + MEM_FUN_VAR_ID = FUN_ID + 10 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + CONST_MEM_FUN_VAR_ID = FUN_ID + 11 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + VOLATILE_MEM_FUN_VAR_ID = FUN_ID + 12 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY), + VOLATILE_CONST_MEM_FUN_VAR_ID = FUN_ID + 13 * BOOST_PP_INC(BOOST_TYPEOF_LIMIT_FUNCTION_ARITY) }; BOOST_TYPEOF_BEGIN_ENCODE_NS diff --git a/include/boost/typeof/register_functions_iterate.hpp b/include/boost/typeof/register_functions_iterate.hpp index acfbf09b16..9a3c5a3bf7 100644 --- a/include/boost/typeof/register_functions_iterate.hpp +++ b/include/boost/typeof/register_functions_iterate.hpp @@ -15,6 +15,13 @@ struct encode_type_impl typedef BOOST_TYPEOF_ENCODE_PARAMS(BOOST_PP_INC(n), FUN_PTR_ID + n) type; }; +template +struct encode_type_impl +{ + typedef R BOOST_PP_CAT(P, n); + typedef BOOST_TYPEOF_ENCODE_PARAMS(BOOST_PP_INC(n), FUN_VAR_PTR_ID + n) type; +}; + template struct decode_type_impl, Iter> { @@ -24,6 +31,15 @@ struct decode_type_impl, Iter> typedef BOOST_PP_CAT(iter, BOOST_PP_INC(n)) iter; }; +template +struct decode_type_impl, Iter> +{ + typedef Iter iter0; + BOOST_TYPEOF_DECODE_PARAMS(BOOST_PP_INC(n)) + typedef BOOST_PP_CAT(p, n)(*type)(BOOST_PP_ENUM_PARAMS(n, p) ...); + typedef BOOST_PP_CAT(iter, BOOST_PP_INC(n)) iter; +}; + #ifndef BOOST_TYPEOF_NO_FUNCTION_TYPES // function references @@ -35,6 +51,13 @@ struct decode_type_impl, Iter> typedef BOOST_TYPEOF_ENCODE_PARAMS(BOOST_PP_INC(n), FUN_REF_ID + n) type; }; + template + struct encode_type_impl + { + typedef R BOOST_PP_CAT(P, n); + typedef BOOST_TYPEOF_ENCODE_PARAMS(BOOST_PP_INC(n), FUN_VAR_REF_ID + n) type; + }; + template struct decode_type_impl, Iter> { @@ -44,6 +67,15 @@ struct decode_type_impl, Iter> typedef BOOST_PP_CAT(iter, BOOST_PP_INC(n)) iter; }; + template + struct decode_type_impl, Iter> + { + typedef Iter iter0; + BOOST_TYPEOF_DECODE_PARAMS(BOOST_PP_INC(n)) + typedef BOOST_PP_CAT(p, n)(&type)(BOOST_PP_ENUM_PARAMS(n, p) ...); + typedef BOOST_PP_CAT(iter, BOOST_PP_INC(n)) iter; + }; + // functions template @@ -53,6 +85,13 @@ struct decode_type_impl, Iter> typedef BOOST_TYPEOF_ENCODE_PARAMS(BOOST_PP_INC(n), FUN_ID + n) type; }; + template + struct encode_type_impl + { + typedef R BOOST_PP_CAT(P, n); + typedef BOOST_TYPEOF_ENCODE_PARAMS(BOOST_PP_INC(n), FUN_VAR_ID + n) type; + }; + template struct decode_type_impl, Iter> { @@ -62,6 +101,15 @@ struct decode_type_impl, Iter> typedef BOOST_PP_CAT(iter, BOOST_PP_INC(n)) iter; }; + template + struct decode_type_impl, Iter> + { + typedef Iter iter0; + BOOST_TYPEOF_DECODE_PARAMS(BOOST_PP_INC(n)) + typedef BOOST_PP_CAT(p, n)(type)(BOOST_PP_ENUM_PARAMS(n, p) ...); + typedef BOOST_PP_CAT(iter, BOOST_PP_INC(n)) iter; + }; + #endif//BOOST_TYPEOF_NO_FUNCTION_TYPES #ifndef BOOST_TYPEOF_NO_MEMBER_FUNCTION_TYPES diff --git a/include/boost/typeof/typeof.hpp b/include/boost/typeof/typeof.hpp index 9ab5d25c1b..d8cc89afc0 100644 --- a/include/boost/typeof/typeof.hpp +++ b/include/boost/typeof/typeof.hpp @@ -15,7 +15,7 @@ #if defined(__COMO__) # ifdef __GNUG__ -# ifndef(BOOST_TYPEOF_EMULATION) +# ifndef BOOST_TYPEOF_EMULATION # ifndef BOOST_TYPEOF_NATIVE # define BOOST_TYPEOF_NATIVE # endif @@ -65,7 +65,7 @@ # endif # define BOOST_TYPEOF_KEYWORD __typeof__ # else -# error typeof emulation is not supported +# define BOOST_TYPEOF_EMULATION_UNSUPPORTED # endif # else // 9.x # ifndef BOOST_TYPEOF_EMULATION @@ -75,7 +75,22 @@ # define BOOST_TYPEOF_KEYWORD __typeof__ # endif # endif - +#elif defined __CODEGEARC__ +# ifndef BOOST_TYPEOF_EMULATION +# ifndef BOOST_TYPEOF_NATIVE +# define BOOST_TYPEOF_EMULATION_UNSUPPORTED +# endif +# else +# define BOOST_TYPEOF_EMULATION_UNSUPPORTED +# endif +#elif defined __BORLANDC__ +# ifndef BOOST_TYPEOF_EMULATION +# ifndef BOOST_TYPEOF_NATIVE +# define BOOST_TYPEOF_EMULATION_UNSUPPORTED +# endif +# else +# define BOOST_TYPEOF_EMULATION_UNSUPPORTED +# endif #elif defined __DMC__ # ifndef BOOST_TYPEOF_EMULATION # ifndef BOOST_TYPEOF_NATIVE @@ -95,24 +110,21 @@ # else # error typeof emulation is not supported # endif -# elif (_MSC_VER >= 1310) // 7.1, 8.0 +# elif (_MSC_VER >= 1310) // 7.1 -> # ifndef BOOST_TYPEOF_EMULATION # ifndef BOOST_TYPEOF_NATIVE -# define BOOST_TYPEOF_NATIVE +# ifndef _MSC_EXTENSIONS +# define BOOST_TYPEOF_EMULATION +# else +# define BOOST_TYPEOF_NATIVE +# endif # endif +# endif +# ifdef BOOST_TYPEOF_NATIVE # include # define MSVC_TYPEOF_HACK # endif -/*# else // 8.0 -# ifndef BOOST_TYPEOF_NATIVE -# ifndef BOOST_TYPEOF_EMULATION -# define BOOST_TYPEOF_EMULATION -# endif -# else -# error native typeof is not supported -# endif*/ # endif - #elif defined(__HP_aCC) # ifndef BOOST_TYPEOF_NATIVE # ifndef BOOST_TYPEOF_EMULATION @@ -163,7 +175,9 @@ #define BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()\ -#ifdef BOOST_TYPEOF_EMULATION +#ifdef BOOST_TYPEOF_EMULATION_UNSUPPORTED +# include +#elif defined BOOST_TYPEOF_EMULATION # define BOOST_TYPEOF_TEXT "using typeof emulation" # include # include diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 025a01239f..a12c05e6b1 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -33,13 +33,13 @@ set(PCBNEW_DIALOGS dialogs/dialog_display_options_base.cpp dialog_drc_base.cpp dialog_drc.cpp - dialog_edit_module_for_BoardEditor.cpp - dialog_edit_module_for_BoardEditor_base.cpp - dialog_edit_module_for_Modedit_base.cpp - dialog_edit_module_for_Modedit.cpp - dialog_edit_module_text.cpp - dialog_edit_module_text_base.cpp - dialog_exchange_modules_base.cpp + dialogs/dialog_edit_module_for_BoardEditor.cpp + dialogs/dialog_edit_module_for_BoardEditor_base.cpp + dialogs/dialog_edit_module_for_Modedit_base.cpp + dialogs/dialog_edit_module_for_Modedit.cpp + dialogs/dialog_edit_module_text.cpp + dialogs/dialog_edit_module_text_base.cpp + dialogs/dialog_exchange_modules_base.cpp dialogs/dialog_export_3Dfiles_base.cpp dialog_freeroute_exchange.cpp dialog_freeroute_exchange_base.cpp @@ -50,10 +50,10 @@ set(PCBNEW_DIALOGS dialog_global_edit_tracks_and_vias.cpp dialog_global_edit_tracks_and_vias_base.cpp dialog_global_pads_edition_base.cpp - dialog_graphic_items_options.cpp - dialog_graphic_items_options_base.cpp - dialog_graphic_item_properties.cpp - dialog_graphic_item_properties_base.cpp + dialogs/dialog_graphic_items_options.cpp + dialogs/dialog_graphic_items_options_base.cpp + dialogs/dialog_graphic_item_properties.cpp + dialogs/dialog_graphic_item_properties_base.cpp dialog_layers_setup.cpp dialog_layers_setup_base.cpp dialog_netlist.cpp @@ -70,8 +70,8 @@ set(PCBNEW_DIALOGS dialogs/dialog_print_using_printer.cpp dialogs/dialog_print_using_printer_base.cpp dialog_orient_footprints.cpp - dialog_mask_clearance.cpp - dialog_mask_clearance_base.cpp + dialogs/dialog_mask_clearance.cpp + dialogs/dialog_mask_clearance_base.cpp dialogs/dialog_SVG_print.cpp dialogs/dialog_SVG_print_base.cpp dialogs/dialog_set_grid_base.cpp diff --git a/pcbnew/dialog_edit_module_text.h b/pcbnew/dialog_edit_module_text.h deleted file mode 100644 index 49456996d3..0000000000 --- a/pcbnew/dialog_edit_module_text.h +++ /dev/null @@ -1,136 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: edtxtmod.h -// Purpose: -// Author: jean-pierre Charras -// Modified by: -// Created: 09/02/2006 18:17:15 -// RCS-ID: -// Copyright: License GNU -// Licence: -///////////////////////////////////////////////////////////////////////////// - -// Generated by DialogBlocks (unregistered), 09/02/2006 18:17:15 - -#ifndef _EDTXTMOD_H_ -#define _EDTXTMOD_H_ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "edtxtmod.h" -#endif - -/*! - * Includes - */ - -////@begin includes -#include "wx/statline.h" -////@end includes - -/*! - * Forward declarations - */ - -////@begin forward declarations -////@end forward declarations - -/*! - * Control identifiers - */ - -////@begin control identifiers -#define ID_DIALOG 10000 -#define SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER -#define SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_TITLE _("TextMod properties") -#define SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_IDNAME ID_DIALOG -#define SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_SIZE wxSize(400, 300) -#define SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_POSITION wxDefaultPosition -#define ID_TEXTCTRL 10003 -#define ID_TEXTCTRL1 10004 -#define ID_TEXTCTRL2 10005 -#define ID_TEXTCTRL3 10006 -#define ID_TEXTCTRL4 10007 -#define ID_TEXTCTRL5 10008 -#define ID_RADIOBOX 10001 -#define ID_RADIOBOX1 10002 -////@end control identifiers - -/*! - * Compatibility - */ - -#ifndef wxCLOSE_BOX -#define wxCLOSE_BOX 0x1000 -#endif - -/*! - * WinEDA_TextModPropertiesFrame class declaration - */ - -class WinEDA_TextModPropertiesFrame: public wxDialog -{ - DECLARE_DYNAMIC_CLASS( WinEDA_TextModPropertiesFrame ) - DECLARE_EVENT_TABLE() - -public: - /// Constructors - WinEDA_TextModPropertiesFrame( ); - WinEDA_TextModPropertiesFrame( WinEDA_BasePcbFrame* parent, - TEXTE_MODULE * TextMod,wxDC * DC, - wxWindowID id = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_SIZE, long style = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_STYLE ); - - /// Creation - bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_SIZE, long style = SYMBOL_WINEDA_TEXTMODPROPERTIESFRAME_STYLE ); - - /// Creates the controls and sizers - void CreateControls(); - -////@begin WinEDA_TextModPropertiesFrame event handler declarations - - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK - void OnOkClick( wxCommandEvent& event ); - - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL - void OnCancelClick( wxCommandEvent& event ); - -////@end WinEDA_TextModPropertiesFrame event handler declarations - -////@begin WinEDA_TextModPropertiesFrame member function declarations - - /// Retrieves bitmap resources - wxBitmap GetBitmapResource( const wxString& name ); - - /// Retrieves icon resources - wxIcon GetIconResource( const wxString& name ); -////@end WinEDA_TextModPropertiesFrame member function declarations - - /// Should we show tooltips? - static bool ShowToolTips(); - void TextModPropertiesAccept(wxCommandEvent& event); - void SetDisplayValue(); - -////@begin WinEDA_TextModPropertiesFrame member variables - wxStaticText* m_ModuleInfoText; - wxStaticText* m_TextDataTitle; - wxTextCtrl* m_Name; - wxStaticText* m_SizeXTitle; - wxTextCtrl* m_TxtSizeCtrlX; - wxStaticText* m_SizeYTitle; - wxTextCtrl* m_TxtSizeCtrlY; - wxStaticText* m_PosXTitle; - wxTextCtrl* m_TxtPosCtrlX; - wxStaticText* m_PosYTitle; - wxTextCtrl* m_TxtPosCtrlY; - wxStaticText* m_WidthTitle; - wxTextCtrl* m_TxtWidthCtlr; - wxRadioBox* m_Orient; - wxRadioBox* m_Show; -////@end WinEDA_TextModPropertiesFrame member variables - - WinEDA_BasePcbFrame * m_Parent; - wxDC * m_DC; - MODULE * m_Module; - TEXTE_MODULE * m_CurrentTextMod; -}; - -#endif - // _EDTXTMOD_H_ diff --git a/pcbnew/dialog_graphic_item_properties_base.fbp b/pcbnew/dialog_graphic_item_properties_base.fbp deleted file mode 100644 index 801ebbb207..0000000000 --- a/pcbnew/dialog_graphic_item_properties_base.fbp +++ /dev/null @@ -1,1111 +0,0 @@ - - - - - - C++ - 1 - UTF-8 - connect - dialog_graphic_item_properties_base - 1000 - none - 0 - DialogGraphicItemProperties_base - - . - - 1 - 1 - 0 - - - - - 1 - - - - 0 - wxID_ANY - - - DialogGraphicItemProperties_base - - 399,247 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU - - Graphic item properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - - bLeftSizer - wxVERTICAL - none - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Start Position X - - - m_Start_Center_XText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_Center_StartXCtrl - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Start Position Y - - - m_Start_Center_YText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_Center_StartYCtrl - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - End Position X - - - m_EndX_Radius_Text - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_EndX_Radius_Ctrl - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - End Position Y - - - m_EndY_Text - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_EndY_Ctrl - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Arc Angle (0.1 degree) - - - m_Angle_Text - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANGLE_CTRL - - 0 - - m_Angle_Ctrl - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bMiddleSizer - wxVERTICAL - none - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Item Thickness - - - m_ItemThicknessText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_ThicknessCtrl - protected - - - - - Thickness of this item - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Default Thickness - - - m_DefaultThicknessText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_DefaultThicknessCtrl - protected - - - - - Default value for thickness when creating a new graphic item - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND | wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline1 - protected - - - wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Layer: - - - m_LayerText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - - - 1 - - - 0 - wxID_LAYER_SELECTION - - - m_LayerSelection - protected - - 0 - - - - - - - - OnLayerChoice - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - - bRightSizer - wxVERTICAL - none - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL - 0 - - - - 1 - 1 - - - 0 - wxID_OK - OK - - - m_buttonOK - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL - 0 - - - - 0 - 1 - - - 0 - wxID_CANCEL - Cancel - - - m_buttonCANCEL - protected - - - - - - - - - OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pcbnew/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp similarity index 100% rename from pcbnew/dialog_edit_module_for_BoardEditor.cpp rename to pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp diff --git a/pcbnew/dialog_edit_module_for_BoardEditor.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h similarity index 100% rename from pcbnew/dialog_edit_module_for_BoardEditor.h rename to pcbnew/dialogs/dialog_edit_module_for_BoardEditor.h diff --git a/pcbnew/dialog_edit_module_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp similarity index 100% rename from pcbnew/dialog_edit_module_for_BoardEditor_base.cpp rename to pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp diff --git a/pcbnew/dialog_edit_module_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp similarity index 73% rename from pcbnew/dialog_edit_module_for_BoardEditor_base.fbp rename to pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp index 871cb71b49..0785f99ebe 100644 --- a/pcbnew/dialog_edit_module_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 UTF-8 @@ -12,66 +12,66 @@ none 1 dialog_edit_module_for_BoardEditor_base - + . - + 1 0 0 - - - + + + 1 - - - + + + 0 wxID_ANY - - + + DIALOG_MODULE_BOARD_EDITOR_BASE - + 474,607 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + Module properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + m_GeneralBoxSizer wxVERTICAL private @@ -80,99 +80,99 @@ wxEXPAND | wxALL 1 - - - + + + 1 - - + + 0 ID_NOTEBOOK - - + + m_NoteBook protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Properties 1 - - + + 1 - - + + 0 wxID_ANY - - + + m_PanelProperties protected - - - - - - + + + + + + wxSUNKEN_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_PanelPropertiesBoxSizer wxHORIZONTAL none @@ -183,11 +183,11 @@ wxID_ANY Fields: - + PropLeftSizer wxVERTICAL none - + 5 wxEXPAND @@ -195,116 +195,116 @@ wxID_ANY Reference - + sbSizerRef wxHORIZONTAL none - + 5 - + 1 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_ReferenceCtrl protected - - + + wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 - - + + 0 1 - - + + 0 wxID_ANY Edit - - + + m_button4 protected - - + + wxBU_EXACTFIT - - - - - + + + + + OnEditReference - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -316,116 +316,116 @@ wxID_ANY Value - + sbSizerValue wxHORIZONTAL none - + 5 - + 1 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_ValueCtrl protected - - + + wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 - - + + 0 1 - - + + 0 wxID_ANY Edit - - + + m_button5 protected - - + + wxBU_EXACTFIT - - - - - + + + + + OnEditValue - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -435,53 +435,53 @@ wxALL|wxEXPAND 0 - + "Top" "Bottom" - + 1 - - + + 0 wxID_ANY Side Select 1 - - + + m_LayerCtrl protected - + 0 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -491,63 +491,63 @@ wxID_ANY Orientation - + sbSizerOrientation wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + "Normal" "+ 90.0" "- 90.0" "180.0" "User" - + 1 - - + + 0 ID_LISTBOX_ORIENT_SELECT Orientation 1 - - + + m_OrientCtrl protected - + 0 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + ModuleOrientEvent - - - - - - + + + + + + @@ -555,50 +555,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Orientation (in 0.1 degrees) - - + + m_staticText4 protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -606,54 +606,54 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OrientValue protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -665,60 +665,60 @@ wxID_ANY Position - + sbSizerPosition wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY X - - + + XPositionStatic protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -726,54 +726,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_ModPositionX protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -781,50 +781,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Y - - + + YPositionStatic protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -832,54 +832,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_ModPositionY protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -888,10 +888,10 @@ 5 - + 0 - + m_PropRightSizer wxVERTICAL private @@ -900,51 +900,51 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + + 0 1 - - + + 0 ID_MODULE_PROPERTIES_EXCHANGE Change Module(s) - - + + m_buttonExchange protected - - - - - - - - + + + + + + + + ExchangeModule - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -952,51 +952,51 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + + 0 1 - - + + 0 ID_GOTO_MODULE_EDITOR Module Editor - - + + m_buttonModuleEditor protected - - - - - - - - + + + + + + + + GotoModuleEditor - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1004,53 +1004,53 @@ wxALL|wxEXPAND 0 - + "Normal" "Normal+Insert" "Virtual" - + 1 - - + + 0 wxID_ANY Attributs: 1 - - + + m_AttributsCtrl protected - + 1 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1058,53 +1058,53 @@ wxALL|wxEXPAND 0 - + "Free" "Locked" - + 1 - - + + 0 wxID_ANY Move and Auto Place 1 - - + + m_AutoPlaceCtrl protected - + 0 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1114,17 +1114,17 @@ wxID_ANY Auto Move and Place - + sbSizerAutoplace wxHORIZONTAL none - + 5 wxEXPAND 1 - + bSizerRotOpt wxVERTICAL none @@ -1133,50 +1133,50 @@ wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Rotation 90 degree - - + + m_staticText11 protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1184,71 +1184,71 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + + 1 - - + + 0 wxID_ANY 10 - + 0 - + m_CostRot90Ctrl protected - - + + wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1258,7 +1258,7 @@ wxEXPAND 1 - + bSizerMoveOpt wxVERTICAL none @@ -1267,50 +1267,50 @@ wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Rotation 180 degree - - + + m_staticText12 protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1318,71 +1318,71 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + + 1 - - + + 0 wxID_ANY 10 - + 0 - + m_CostRot180Ctrl protected - - + + wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1396,60 +1396,60 @@ wxID_ANY Masks clearances local values: - + sbSizerLocalProperties wxVERTICAL none - + 5 wxALL|wxALIGN_CENTER_HORIZONTAL 0 - - + + 1 - + ,90,92,-1,70,0 0 wxID_ANY Set these values to 0 to use global values - - + + m_staticTextInfo protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1459,10 +1459,10 @@ 3 wxBOTH - - + + 0 - + fgSizerClearances wxFLEX_GROWMODE_SPECIFIED none @@ -1473,50 +1473,50 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY All pads nets clearance - - + + m_staticTextNetClearance protected - - - - + + + + This is the local net clearance for all pad of this footprint If 0, the Netclass values are used This value can be superseded by a pad local value. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1524,54 +1524,54 @@ wxALL 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_NetClearanceValueCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1579,50 +1579,50 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 - - + + 1 - - + + 0 wxID_ANY Inch - - + + m_NetClearanceUnits protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1630,48 +1630,48 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_staticline1 protected - - + + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1679,48 +1679,48 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_staticline2 protected - - + + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1728,48 +1728,48 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_staticline3 protected - - + + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1777,50 +1777,50 @@ wxALL|wxALIGN_CENTER_VERTICAL 0 - - + + 1 - - + + 0 wxID_ANY Solder mask clearance: - - + + m_MaskClearanceTitle protected - - - - + + + + This is the local clearance between pads and the solder mask for this footprint This value can be superseded by a pad local value. If 0, the global value is used - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1828,54 +1828,54 @@ wxALL|wxALIGN_CENTER_VERTICAL 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_SolderMaskMarginCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1883,50 +1883,50 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 - - + + 1 - - + + 0 wxID_ANY Inch - - + + m_SolderMaskMarginUnits protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1934,50 +1934,50 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Solder paste clearance: - - + + m_staticTextSolderPaste protected - - - - + + + + This is the local clearance between pads and the solder paste for this footprint. This value can be superseded by a pad local values. The final clearance value is the sum of this value and the clearance value ratio A negative value means a smaller mask size than pad size - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1985,54 +1985,54 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_SolderPasteMarginCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2040,50 +2040,50 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 0 - - + + 1 - - + + 0 wxID_ANY Inch - - + + m_SolderPasteMarginUnits protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2091,50 +2091,50 @@ wxALL|wxALIGN_CENTER_VERTICAL 0 - - + + 1 - - + + 0 wxID_ANY Solder mask ratio clearance: - - + + m_staticTextRatio protected - - - - + + + + This is the local clearance ratio in per cent between pads and the solder paste for this footprint. A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by a pad local value. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2142,54 +2142,54 @@ wxALIGN_CENTER_VERTICAL|wxALL 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_SolderPasteMarginRatioCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2197,50 +2197,50 @@ wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 - - + + 1 - - + + 0 wxID_ANY % - - + + m_SolderPasteRatioMarginUnits protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2253,53 +2253,53 @@ - + 3D settings 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_Panel3D protected - - - - - - + + + + + + wxSUNKEN_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain3D wxVERTICAL none @@ -2308,50 +2308,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY 3D Shape Name - - + + m_staticText3Dname protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2359,51 +2359,51 @@ wxALL|wxEXPAND 0 - - - + + + 1 - - + + 0 wxID_ANY - - + + m_3D_ShapeNameListBox protected - - + + wxLB_SINGLE - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + On3DShapeNameSelected - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -2411,7 +2411,7 @@ wxEXPAND 1 - + bLowerSizer3D wxHORIZONTAL none @@ -2422,11 +2422,11 @@ wxID_ANY 3D Scale and Pos - + m_Sizer3DValues wxVERTICAL public - + @@ -2434,7 +2434,7 @@ wxALIGN_CENTER_VERTICAL 0 - + bSizer3DButtons wxVERTICAL none @@ -2443,51 +2443,51 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + + 0 1 - - + + 0 ID_BROWSE_3D_LIB Browse Shapes - - + + m_buttonBrowse protected - - - - - - - - + + + + + + + + Browse3DLib - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2495,51 +2495,51 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + + 0 1 - - + + 0 ID_ADD_3D_SHAPE Add 3D Shape - - + + m_buttonAdd protected - - - - - - - - + + + + + + + + Add3DShape - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2547,51 +2547,51 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + + 0 1 - - + + 0 ID_REMOVE_3D_SHAPE Remove 3D Shape - - + + m_buttonRemove protected - - - - - - - - + + + + + + + + Remove3DShape - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2616,17 +2616,17 @@ 1 0 0 - + m_sdbSizerStdButtons protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/pcbnew/dialog_edit_module_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h similarity index 100% rename from pcbnew/dialog_edit_module_for_BoardEditor_base.h rename to pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h diff --git a/pcbnew/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp similarity index 100% rename from pcbnew/dialog_edit_module_for_Modedit.cpp rename to pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp diff --git a/pcbnew/dialog_edit_module_for_Modedit.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit.h similarity index 100% rename from pcbnew/dialog_edit_module_for_Modedit.h rename to pcbnew/dialogs/dialog_edit_module_for_Modedit.h diff --git a/pcbnew/dialog_edit_module_for_Modedit_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp similarity index 100% rename from pcbnew/dialog_edit_module_for_Modedit_base.cpp rename to pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp diff --git a/pcbnew/dialog_edit_module_for_Modedit_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp similarity index 72% rename from pcbnew/dialog_edit_module_for_Modedit_base.fbp rename to pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp index a900f32aa1..e089cd1a8e 100644 --- a/pcbnew/dialog_edit_module_for_Modedit_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 UTF-8 @@ -12,66 +12,66 @@ none 1 dialog_edit_module_for_Modedit_base - + . - + 1 0 0 - - - + + + 1 - - - + + + 0 wxID_ANY - - + + DIALOG_MODULE_MODULE_EDITOR_BASE - + 541,540 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + Module properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + m_GeneralBoxSizer wxVERTICAL private @@ -80,99 +80,99 @@ wxEXPAND | wxALL 1 - - - + + + 1 - - + + 0 ID_NOTEBOOK - - + + m_NoteBook protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Properties 1 - - + + 1 - - + + 0 wxID_ANY - - + + m_PanelProperties protected - - - - - - + + + + + + wxSUNKEN_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + m_PanelPropertiesBoxSizer wxHORIZONTAL none @@ -183,11 +183,11 @@ wxID_ANY Fields: - + PropLeftSizer wxVERTICAL none - + 5 wxEXPAND @@ -199,60 +199,60 @@ sbSizerDoc wxHORIZONTAL none - + 5 - + 1 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_DocCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -264,71 +264,71 @@ wxID_ANY Keywords - + sbSizerKeysW wxHORIZONTAL none - + 5 - + 1 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_KeywordCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 20 @@ -343,116 +343,116 @@ wxID_ANY Reference - + sbSizerRef wxHORIZONTAL none - + 5 - + 1 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_ReferenceCtrl protected - - + + wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 - - + + 0 1 - - + + 0 wxID_ANY Edit - - + + m_button4 protected - - + + wxBU_EXACTFIT - - - - - + + + + + OnEditReference - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -464,123 +464,123 @@ wxID_ANY Value - + sbSizerValue wxHORIZONTAL none - + 5 - + 1 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_ValueCtrl protected - - + + wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 - - + + 0 1 - - + + 0 wxID_ANY Edit - - + + m_button5 protected - - + + wxBU_EXACTFIT - - - - - + + + + + OnEditValue - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 20 @@ -595,69 +595,69 @@ wxID_ANY Footprint Name in Lib - + sbSizerFootprintName wxHORIZONTAL none - + 5 - + 1 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_FootprintNameCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 0 @@ -671,10 +671,10 @@ 5 - + 0 - + m_PropRightSizer wxVERTICAL private @@ -683,53 +683,53 @@ wxALL|wxEXPAND 0 - + "Normal" "Normal+Insert" "Virtual" - + 1 - - + + 0 wxID_ANY Attributs: 1 - - + + m_AttributsCtrl protected - + 0 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -737,53 +737,53 @@ wxALL|wxEXPAND 0 - + "Free" "Locked" - + 1 - - + + 0 wxID_ANY Move and Auto Place 1 - - + + m_AutoPlaceCtrl protected - + 0 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -793,17 +793,17 @@ wxID_ANY Auto Move and Place - + sbSizerAutoplace wxHORIZONTAL none - + 5 - + 1 - + bSizerRot90 wxVERTICAL none @@ -812,50 +812,50 @@ wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL 0 - - + + 1 - - + + 0 wxID_ANY Rotation 90 degree - - + + m_staticText11 protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -863,81 +863,81 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY 10 - + 0 -1,-1 m_CostRot90Ctrl protected - + -1,-1 wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - + 1 - + bSizerRot180 wxVERTICAL none @@ -946,50 +946,50 @@ wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL 0 - - + + 1 - - + + 0 wxID_ANY Rotation 180 degree - - + + m_staticText12 protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -997,71 +997,71 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY 10 - + 0 -1,-1 m_CostRot180Ctrl protected - - + + wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1075,60 +1075,60 @@ wxID_ANY Masks clearances local values: - + sbSizer8 wxVERTICAL none - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL 0 - - + + 1 - + ,90,92,-1,70,0 0 wxID_ANY Set these values to 0 to use global values - - + + m_staticTextInfo protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1138,10 +1138,10 @@ 3 wxBOTH - - + + 0 - + fgSizer1 wxFLEX_GROWMODE_SPECIFIED none @@ -1152,50 +1152,50 @@ wxLEFT|wxALIGN_CENTER_VERTICAL 0 - - + + 1 - - + + 0 wxID_ANY All pads nets clearance - - + + m_staticTextNetClearance protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1203,54 +1203,54 @@ wxALL 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_NetClearanceValueCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1258,50 +1258,50 @@ wxRIGHT|wxALIGN_CENTER_VERTICAL 0 - - + + 1 - - + + 0 wxID_ANY Inch - - + + m_NetClearanceUnits protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1309,48 +1309,48 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_staticline1 protected - - + + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1358,48 +1358,48 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_staticline2 protected - - + + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1407,48 +1407,48 @@ wxEXPAND|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_staticline3 protected - - + + wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1456,50 +1456,50 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Solder mask clearance: - - + + m_MaskClearanceTitle protected - - - - + + + + This is the local clearance between pads and the solder mask for this footprint This value can be superseded by a pad local value. If 0, the global value is used - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1507,54 +1507,54 @@ wxALL 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_SolderMaskMarginCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1562,50 +1562,50 @@ wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - - + + 1 - - + + 0 wxID_ANY inch - - + + m_SolderMaskMarginUnits protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1613,50 +1613,50 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Solder paste clearance: - - + + m_staticTextSolderPaste protected - - - - + + + + This is the local clearance between pads and the solder paste for this footprint. This value can be superseded by a pad local values. The final clearance value is the sum of this value and the clearance value ratio A negative value means a smaller mask size than pad size - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1664,54 +1664,54 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_SolderPasteMarginCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1719,50 +1719,50 @@ wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - - + + 1 - - + + 0 wxID_ANY Inch - - + + m_SolderPasteMarginUnits protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1770,50 +1770,50 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Solder mask ratio clearance: - - + + m_staticTextRatio protected - - - - + + + + This is the local clearance ratio in per cent between pads and the solder paste for this footprint. A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by a pad local value. The final clearance value is the sum of this value and the clearance value A negative value means a smaller mask size than pad size. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1821,54 +1821,54 @@ wxALL 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_SolderPasteMarginRatioCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1876,50 +1876,50 @@ wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - - + + 1 - - + + 0 wxID_ANY % - - + + m_SolderPasteRatioMarginUnits protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1932,53 +1932,53 @@ - + 3D settings 0 - - + + 1 - - + + 0 wxID_ANY - - + + m_Panel3D protected - - - - - - + + + + + + wxSUNKEN_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain3D wxVERTICAL none @@ -1987,50 +1987,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY 3D Shape Name - - + + m_staticText3Dname protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2038,51 +2038,51 @@ wxALL|wxEXPAND 0 - - - + + + 1 - - + + 0 wxID_ANY - - + + m_3D_ShapeNameListBox protected - - + + wxLB_SINGLE - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + On3DShapeNameSelected - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -2090,7 +2090,7 @@ wxEXPAND 1 - + bLowerSizer3D wxHORIZONTAL none @@ -2101,11 +2101,11 @@ wxID_ANY 3D Scale and Pos - + m_Sizer3DValues wxVERTICAL public - + @@ -2113,7 +2113,7 @@ wxALIGN_CENTER_VERTICAL 0 - + bSizer3DButtons wxVERTICAL none @@ -2122,51 +2122,51 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + + 0 1 - - + + 0 ID_BROWSE_3D_LIB Add 3D Shape - - + + m_buttonBrowse protected - - - - - - - - + + + + + + + + BrowseAndAdd3DLib - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2174,51 +2174,51 @@ wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - - + + 0 1 - - + + 0 ID_REMOVE_3D_SHAPE Remove 3D Shape - - + + m_buttonRemove protected - - - - - - - - + + + + + + + + Remove3DShape - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2243,17 +2243,17 @@ 1 0 0 - + m_sdbSizerStdButtons protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/pcbnew/dialog_edit_module_for_Modedit_base.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h similarity index 100% rename from pcbnew/dialog_edit_module_for_Modedit_base.h rename to pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h diff --git a/pcbnew/dialog_edit_module_text.cpp b/pcbnew/dialogs/dialog_edit_module_text.cpp similarity index 100% rename from pcbnew/dialog_edit_module_text.cpp rename to pcbnew/dialogs/dialog_edit_module_text.cpp diff --git a/pcbnew/dialog_edit_module_text_base.cpp b/pcbnew/dialogs/dialog_edit_module_text_base.cpp similarity index 100% rename from pcbnew/dialog_edit_module_text_base.cpp rename to pcbnew/dialogs/dialog_edit_module_text_base.cpp diff --git a/pcbnew/dialog_edit_module_text_base.fbp b/pcbnew/dialogs/dialog_edit_module_text_base.fbp similarity index 59% rename from pcbnew/dialog_edit_module_text_base.fbp rename to pcbnew/dialogs/dialog_edit_module_text_base.fbp index b7f74e9e30..78ada15364 100644 --- a/pcbnew/dialog_edit_module_text_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_text_base.fbp @@ -1,1137 +1,1137 @@ - - - - - - C++ - 1 - UTF-8 - connect - dialog_edit_module_text_base - 1000 - none - 1 - DialogEditModuleText_base - - . - - 1 - 1 - 0 - - - - - 1 - - - - 0 - wxID_ANY - - - DialogEditModuleText_base - - 357,299 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - Footprint text properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxVERTICAL - none - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL - 0 - - - - 1 - - - 0 - wxID_ANY - Module %s (%s) orient %.1f - - - m_ModuleInfoText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline1 - protected - - - wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Reference: - - - m_TextDataTitle - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_Name - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer2 - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - - bSizer3 - wxVERTICAL - none - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Size X - - - m_SizeXTitle - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_TxtSizeCtrlX - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Size Y - - - m_SizeYTitle - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_TxtSizeCtrlY - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Offset X - - - m_PosXTitle - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_TxtPosCtrlX - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Offset Y - - - m_PosYTitle - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_TxtPosCtrlY - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer4 - wxVERTICAL - none - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Thickness - - - m_WidthTitle - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_TxtWidthCtlr - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - "horizontal" "vertical" - - 1 - - - 0 - wxID_ANY - Orientation - 1 - - - m_Orient - protected - - 0 - - wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - "Visible" "Invisible" - - 1 - - - 0 - wxID_ANY - Display - 1 - - - m_Show - protected - - 0 - - wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - - bSizer5 - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - - "Normal" "Italic" - - 1 - - - 0 - wxID_ANY - Style - 1 - - - m_Style - protected - - 0 - - wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - 10 - protected - 10 - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL - 0 - - - - 1 - 1 - - - 0 - wxID_OK - OK - - - m_buttonOK - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL - 0 - - - - 0 - 1 - - - 0 - wxID_CANCEL - Cancel - - - m_buttonCANCEL - protected - - - - - - - - - OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + C++ + 1 + UTF-8 + connect + dialog_edit_module_text_base + 1000 + none + 1 + DialogEditModuleText_base + + . + + 1 + 1 + 0 + + + + + 1 + + + + 0 + wxID_ANY + + + DialogEditModuleText_base + + 357,299 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + Footprint text properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxVERTICAL + none + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL + 0 + + + + 1 + + + 0 + wxID_ANY + Module %s (%s) orient %.1f + + + m_ModuleInfoText + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_staticline1 + protected + + + wxLI_HORIZONTAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Reference: + + + m_TextDataTitle + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_Name + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizer2 + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + + bSizer3 + wxVERTICAL + none + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Size X + + + m_SizeXTitle + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_TxtSizeCtrlX + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Size Y + + + m_SizeYTitle + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_TxtSizeCtrlY + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Offset X + + + m_PosXTitle + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_TxtPosCtrlX + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Offset Y + + + m_PosYTitle + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_TxtPosCtrlY + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizer4 + wxVERTICAL + none + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Thickness + + + m_WidthTitle + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_TxtWidthCtlr + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + "horizontal" "vertical" + + 1 + + + 0 + wxID_ANY + Orientation + 1 + + + m_Orient + protected + + 0 + + wxRA_SPECIFY_COLS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + "Visible" "Invisible" + + 1 + + + 0 + wxID_ANY + Display + 1 + + + m_Show + protected + + 0 + + wxRA_SPECIFY_COLS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + + bSizer5 + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + + "Normal" "Italic" + + 1 + + + 0 + wxID_ANY + Style + 1 + + + m_Style + protected + + 0 + + wxRA_SPECIFY_COLS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 0 + + 10 + protected + 10 + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL + 0 + + + + 1 + 1 + + + 0 + wxID_OK + OK + + + m_buttonOK + protected + + + + + + + + + OnOkClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL + 0 + + + + 0 + 1 + + + 0 + wxID_CANCEL + Cancel + + + m_buttonCANCEL + protected + + + + + + + + + OnCancelClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialog_edit_module_text_base.h b/pcbnew/dialogs/dialog_edit_module_text_base.h similarity index 100% rename from pcbnew/dialog_edit_module_text_base.h rename to pcbnew/dialogs/dialog_edit_module_text_base.h diff --git a/pcbnew/dialog_exchange_modules_base.cpp b/pcbnew/dialogs/dialog_exchange_modules_base.cpp similarity index 100% rename from pcbnew/dialog_exchange_modules_base.cpp rename to pcbnew/dialogs/dialog_exchange_modules_base.cpp diff --git a/pcbnew/dialog_exchange_modules_base.fbp b/pcbnew/dialogs/dialog_exchange_modules_base.fbp similarity index 62% rename from pcbnew/dialog_exchange_modules_base.fbp rename to pcbnew/dialogs/dialog_exchange_modules_base.fbp index 1eb6011f55..f4b5980baa 100644 --- a/pcbnew/dialog_exchange_modules_base.fbp +++ b/pcbnew/dialogs/dialog_exchange_modules_base.fbp @@ -1,708 +1,708 @@ - - - - - - C++ - 1 - UTF-8 - connect - dialog_exchange_modules_base - 1000 - none - 1 - dialog_exchange_modules_base - - . - - 1 - 0 - 0 - - - - - 1 - - - - 0 - wxID_ANY - - - DIALOG_EXCHANGE_MODULE_BASE - - 416,469 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - Exchange Modules - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - - bUpperSizer - wxHORIZONTAL - none - - 5 - - 1 - - - bLeftSizer - wxVERTICAL - none - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Current Module - - - m_staticText6 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_OldModule - protected - - - wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Current Value - - - m_staticText7 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_OldValue - protected - - - wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - New Module - - - m_staticText8 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_NewModule - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - - bMiddleSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - - "Change module" "Change same modules" "Ch. same module+value" "Change all" - - 1 - - - 0 - ID_SELECTION_CLICKED - Browse Libs modules - 1 - - - m_Selection - protected - - 0 - - wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - OnSelectionClicked - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - - bRightSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - - - 0 - 1 - - - 0 - wxID_OK - OK - - - m_OKbutton - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 0 - 1 - - - 0 - wxID_CANCEL - Quit - - - m_Quitbutton - protected - - - - - - - - - OnQuit - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 0 - 1 - - - 0 - wxID_ANY - Browse - - - m_Browsebutton - protected - - - - - - - - - BrowseAndSelectFootprint - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 1 - - - - 1 - - - 0 - wxID_ANY - - 0 - 450,300 - m_WinMessages - protected - - - wxTE_MULTILINE|wxTE_READONLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + C++ + 1 + UTF-8 + connect + dialog_exchange_modules_base + 1000 + none + 1 + dialog_exchange_modules_base + + . + + 1 + 0 + 0 + + + + + 1 + + + + 0 + wxID_ANY + + + DIALOG_EXCHANGE_MODULE_BASE + + 416,469 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + Exchange Modules + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + + bUpperSizer + wxHORIZONTAL + none + + 5 + + 1 + + + bLeftSizer + wxVERTICAL + none + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Current Module + + + m_staticText6 + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_OldModule + protected + + + wxTE_READONLY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Current Value + + + m_staticText7 + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_OldValue + protected + + + wxTE_READONLY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + New Module + + + m_staticText8 + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_NewModule + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + + bMiddleSizer + wxVERTICAL + none + + 5 + wxALL + 0 + + + "Change module" "Change same modules" "Ch. same module+value" "Change all" + + 1 + + + 0 + ID_SELECTION_CLICKED + Browse Libs modules + 1 + + + m_Selection + protected + + 0 + + wxRA_SPECIFY_COLS + + + + + + + + + + + + + + + + + + + + + + + OnSelectionClicked + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + + bRightSizer + wxVERTICAL + none + + 5 + wxALL + 0 + + + + 0 + 1 + + + 0 + wxID_OK + OK + + + m_OKbutton + protected + + + + + + + + + OnOkClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + + 0 + 1 + + + 0 + wxID_CANCEL + Quit + + + m_Quitbutton + protected + + + + + + + + + OnQuit + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + + 0 + 1 + + + 0 + wxID_ANY + Browse + + + m_Browsebutton + protected + + + + + + + + + BrowseAndSelectFootprint + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 + + + + 1 + + + 0 + wxID_ANY + + 0 + 450,300 + m_WinMessages + protected + + + wxTE_MULTILINE|wxTE_READONLY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialog_exchange_modules_base.h b/pcbnew/dialogs/dialog_exchange_modules_base.h similarity index 100% rename from pcbnew/dialog_exchange_modules_base.h rename to pcbnew/dialogs/dialog_exchange_modules_base.h diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp index 284a02cbe6..a5ebe76c26 100644 --- a/pcbnew/dialogs/dialog_gendrill.cpp +++ b/pcbnew/dialogs/dialog_gendrill.cpp @@ -1,6 +1,29 @@ -// Name: dialog_gendrill.cpp -// Author: jean-pierre Charras -// Licence: GPL +/** + ** @file dialog_gendrill.cpp + */ +/* + * This program source code file is part of KICAD, a free EDA CAD application. + * + * Copyright (C) 1992-2010 Jean_Pierre Charras + * Copyright (C) 1992-2010 Kicad Developers, see change_log.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 + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ #include "fctsys.h" #include "appl_wxstruct.h" @@ -33,7 +56,6 @@ static DRILL_PRECISION precisionListForMetric[] = }; - DIALOG_GENDRILL::DIALOG_GENDRILL( WinEDA_PcbFrame* parent ) : DIALOG_GENDRILL_BASE( parent ) { diff --git a/pcbnew/dialogs/dialog_gendrill.h b/pcbnew/dialogs/dialog_gendrill.h index 1d0082910a..ad7456da36 100644 --- a/pcbnew/dialogs/dialog_gendrill.h +++ b/pcbnew/dialogs/dialog_gendrill.h @@ -5,7 +5,7 @@ /* * This program source code file is part of KICAD, a free EDA CAD application. * - * Copyright (C) 1992-2010 Jean_Pierre Charras + * Copyright (C) 1992-2010 Jean_Pierre Charras * Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors. * * This program is free software; you can redistribute it and/or diff --git a/pcbnew/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp similarity index 100% rename from pcbnew/dialog_graphic_item_properties.cpp rename to pcbnew/dialogs/dialog_graphic_item_properties.cpp diff --git a/pcbnew/dialog_graphic_item_properties_base.cpp b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp similarity index 100% rename from pcbnew/dialog_graphic_item_properties_base.cpp rename to pcbnew/dialogs/dialog_graphic_item_properties_base.cpp diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp new file mode 100644 index 0000000000..12aeb6f679 --- /dev/null +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp @@ -0,0 +1,1111 @@ + + + + + + C++ + 1 + UTF-8 + connect + dialog_graphic_item_properties_base + 1000 + none + 0 + DialogGraphicItemProperties_base + + . + + 1 + 1 + 0 + + + + + 1 + + + + 0 + wxID_ANY + + + DialogGraphicItemProperties_base + + 399,247 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU + + Graphic item properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + + bLeftSizer + wxVERTICAL + none + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Start Position X + + + m_Start_Center_XText + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_Center_StartXCtrl + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Start Position Y + + + m_Start_Center_YText + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_Center_StartYCtrl + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + End Position X + + + m_EndX_Radius_Text + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_EndX_Radius_Ctrl + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + End Position Y + + + m_EndY_Text + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_EndY_Ctrl + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Arc Angle (0.1 degree) + + + m_Angle_Text + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANGLE_CTRL + + 0 + + m_Angle_Ctrl + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bMiddleSizer + wxVERTICAL + none + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Item Thickness + + + m_ItemThicknessText + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_ThicknessCtrl + protected + + + + + Thickness of this item + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Default Thickness + + + m_DefaultThicknessText + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_DefaultThicknessCtrl + protected + + + + + Default value for thickness when creating a new graphic item + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND | wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_staticline1 + protected + + + wxLI_HORIZONTAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Layer: + + + m_LayerText + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + + + 1 + + + 0 + wxID_LAYER_SELECTION + + + m_LayerSelection + protected + + 0 + + + + + + + + OnLayerChoice + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + + bRightSizer + wxVERTICAL + none + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL + 0 + + + + 1 + 1 + + + 0 + wxID_OK + OK + + + m_buttonOK + protected + + + + + + + + + OnOkClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL + 0 + + + + 0 + 1 + + + 0 + wxID_CANCEL + Cancel + + + m_buttonCANCEL + protected + + + + + + + + + OnCancelClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialog_graphic_item_properties_base.h b/pcbnew/dialogs/dialog_graphic_item_properties_base.h similarity index 100% rename from pcbnew/dialog_graphic_item_properties_base.h rename to pcbnew/dialogs/dialog_graphic_item_properties_base.h diff --git a/pcbnew/dialog_graphic_items_options.cpp b/pcbnew/dialogs/dialog_graphic_items_options.cpp similarity index 100% rename from pcbnew/dialog_graphic_items_options.cpp rename to pcbnew/dialogs/dialog_graphic_items_options.cpp diff --git a/pcbnew/dialog_graphic_items_options.h b/pcbnew/dialogs/dialog_graphic_items_options.h similarity index 100% rename from pcbnew/dialog_graphic_items_options.h rename to pcbnew/dialogs/dialog_graphic_items_options.h diff --git a/pcbnew/dialog_graphic_items_options_base.cpp b/pcbnew/dialogs/dialog_graphic_items_options_base.cpp similarity index 100% rename from pcbnew/dialog_graphic_items_options_base.cpp rename to pcbnew/dialogs/dialog_graphic_items_options_base.cpp diff --git a/pcbnew/dialog_graphic_items_options_base.fbp b/pcbnew/dialogs/dialog_graphic_items_options_base.fbp similarity index 62% rename from pcbnew/dialog_graphic_items_options_base.fbp rename to pcbnew/dialogs/dialog_graphic_items_options_base.fbp index d3bdc948cc..7d69b6b510 100644 --- a/pcbnew/dialog_graphic_items_options_base.fbp +++ b/pcbnew/dialogs/dialog_graphic_items_options_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 UTF-8 @@ -12,66 +12,66 @@ none 1 dialog_graphic_items_options - + . - + 1 0 0 - - - + + + 1 - - - + + + 0 wxID_ANY - - + + DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE - + 459,315 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + Texts and Drawings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizerMain wxVERTICAL none @@ -80,7 +80,7 @@ wxEXPAND 1 - + bSizerUpper wxHORIZONTAL none @@ -91,60 +91,60 @@ wxID_ANY Graphics: - + sbSizerLeft wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Graphic segm Width - - + + m_GraphicSegmWidthTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -152,54 +152,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptPcbSegmWidth protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -207,50 +207,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Board Edges Width - - + + m_BoardEdgesWidthTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -258,54 +258,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptPcbEdgesWidth protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -313,50 +313,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Copper Text Width - - + + m_CopperTextWidthTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -364,54 +364,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptPcbTextWidth protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -419,50 +419,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Text Size V - - + + m_TextSizeVTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -470,54 +470,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptPcbTextVSize protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -525,50 +525,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Text Size H - - + + m_TextSizeHTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -576,54 +576,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptPcbTextHSize protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -635,60 +635,60 @@ wxID_ANY Modules: - + sbSizerMiddle wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Edges Module Width - - + + m_EdgeModWidthTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -696,54 +696,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptModuleEdgesWidth protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -751,50 +751,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Text Module Width - - + + m_TextModWidthTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -802,54 +802,54 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptModuleTextWidth protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -857,50 +857,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Text Module Size V - - + + m_TextModSizeVTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -908,54 +908,54 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptModuleTextVSize protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -963,50 +963,50 @@ wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Text Module Size H - - + + m_TextModSizeHTitle protected - - - - - - - - + + + + + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1014,54 +1014,54 @@ wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_OptModuleTextHSize protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1073,60 +1073,60 @@ wxID_ANY General: - + sbSizerRight wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY Default pen size - - + + m_DefaultPenSizeTitle protected - - - - + + + + Pen size used to draw items that have no pen size specified. Used mainly to draw items in sketch mode. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1134,54 +1134,54 @@ wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - - + + 1 - - + + 0 wxID_ANY - + 0 - + m_DefaultPenSizeCtrl protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1201,17 +1201,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/pcbnew/dialog_graphic_items_options_base.h b/pcbnew/dialogs/dialog_graphic_items_options_base.h similarity index 100% rename from pcbnew/dialog_graphic_items_options_base.h rename to pcbnew/dialogs/dialog_graphic_items_options_base.h diff --git a/pcbnew/dialog_mask_clearance.cpp b/pcbnew/dialogs/dialog_mask_clearance.cpp similarity index 100% rename from pcbnew/dialog_mask_clearance.cpp rename to pcbnew/dialogs/dialog_mask_clearance.cpp diff --git a/pcbnew/dialog_mask_clearance.h b/pcbnew/dialogs/dialog_mask_clearance.h similarity index 100% rename from pcbnew/dialog_mask_clearance.h rename to pcbnew/dialogs/dialog_mask_clearance.h diff --git a/pcbnew/dialog_mask_clearance_base.cpp b/pcbnew/dialogs/dialog_mask_clearance_base.cpp similarity index 100% rename from pcbnew/dialog_mask_clearance_base.cpp rename to pcbnew/dialogs/dialog_mask_clearance_base.cpp diff --git a/pcbnew/dialog_mask_clearance_base.fbp b/pcbnew/dialogs/dialog_mask_clearance_base.fbp similarity index 75% rename from pcbnew/dialog_mask_clearance_base.fbp rename to pcbnew/dialogs/dialog_mask_clearance_base.fbp index 293613539f..c4e8f1a9bf 100644 --- a/pcbnew/dialog_mask_clearance_base.fbp +++ b/pcbnew/dialogs/dialog_mask_clearance_base.fbp @@ -1,770 +1,770 @@ - - - - - - C++ - 1 - UTF-8 - table - dialog_mask_clearance_base - 1000 - none - 1 - DialogMaskClearanceOptions - - . - - 1 - 1 - 0 - - - - - 1 - - - - 0 - wxID_ANY - - - DIALOG_PADS_MASK_CLEARANCE_BASE - - 361,253 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - Pads Mask Clearance - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bMainUpperSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - wxID_ANY - Dimensions: - - sbMiddleRightSizer - wxVERTICAL - none - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Note: - a positive value means a mask bigger than a pad - a negative value means a mask smaller than a pad - - - m_staticTextInfo - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND | wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline1 - protected - - - wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 3 - wxBOTH - - - 0 - - fgGridSolderMaskSizer - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Solder mask clearance: - - - m_MaskClearanceTitle - protected - - - - - This is the global clearance between pads and the solder mask This value can be superseded by local values for a footprint or a pad. - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_SolderMaskMarginCtrl - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Inch - - - m_SolderMaskMarginUnits - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Solder paste clearance: - - - m_staticTextSolderPaste - protected - - - - - This is the global clearance between pads and the solder paste This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value ratio - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_SolderPasteMarginCtrl - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Inch - - - m_SolderPasteMarginUnits - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT - 0 - - - - 1 - - - 0 - wxID_ANY - Solder mask ratio clearance: - - - m_staticTextRatio - protected - - - - - This is the global clearance ratio in per cent between pads and the solder paste A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - m_SolderPasteMarginRatioCtrl - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxBOTTOM|wxRIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - % - - - m_SolderPasteRatioMarginUnits - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND | wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticline11 - protected - - - wxLI_HORIZONTAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxBOTTOM - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbButtonsSizer - protected - - OnButtonCancelClick - - - - OnButtonOkClick - - - - - - - - + + + + + + C++ + 1 + UTF-8 + table + dialog_mask_clearance_base + 1000 + none + 1 + DialogMaskClearanceOptions + + . + + 1 + 1 + 0 + + + + + 1 + + + + 0 + wxID_ANY + + + DIALOG_PADS_MASK_CLEARANCE_BASE + + 361,253 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + Pads Mask Clearance + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bMainUpperSizer + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + wxID_ANY + Dimensions: + + sbMiddleRightSizer + wxVERTICAL + none + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Note: - a positive value means a mask bigger than a pad - a negative value means a mask smaller than a pad + + + m_staticTextInfo + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND | wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_staticline1 + protected + + + wxLI_HORIZONTAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 3 + wxBOTH + + + 0 + + fgGridSolderMaskSizer + wxFLEX_GROWMODE_SPECIFIED + none + 2 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Solder mask clearance: + + + m_MaskClearanceTitle + protected + + + + + This is the global clearance between pads and the solder mask This value can be superseded by local values for a footprint or a pad. + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_SolderMaskMarginCtrl + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + + + 1 + + + 0 + wxID_ANY + Inch + + + m_SolderMaskMarginUnits + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Solder paste clearance: + + + m_staticTextSolderPaste + protected + + + + + This is the global clearance between pads and the solder paste This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value ratio + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_SolderPasteMarginCtrl + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + + + 1 + + + 0 + wxID_ANY + Inch + + + m_SolderPasteMarginUnits + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Solder mask ratio clearance: + + + m_staticTextRatio + protected + + + + + This is the global clearance ratio in per cent between pads and the solder paste A value of 10 means the clearance value is 10 per cent of the pad size This value can be superseded by local values for a footprint or a pad. The final clearance value is the sum of this value and the clearance value + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + m_SolderPasteMarginRatioCtrl + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT + 0 + + + + 1 + + + 0 + wxID_ANY + % + + + m_SolderPasteRatioMarginUnits + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND | wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_staticline11 + protected + + + wxLI_HORIZONTAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxBOTTOM + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbButtonsSizer + protected + + OnButtonCancelClick + + + + OnButtonOkClick + + + + + + + + diff --git a/pcbnew/dialog_mask_clearance_base.h b/pcbnew/dialogs/dialog_mask_clearance_base.h similarity index 100% rename from pcbnew/dialog_mask_clearance_base.h rename to pcbnew/dialogs/dialog_mask_clearance_base.h diff --git a/pcbnew/gendrill.cpp b/pcbnew/gendrill.cpp index 08103cf9a6..83e77be592 100644 --- a/pcbnew/gendrill.cpp +++ b/pcbnew/gendrill.cpp @@ -8,7 +8,7 @@ /* * This program source code file is part of KICAD, a free EDA CAD application. * - * Copyright (C) 1992-2010 Jean_Pierre Charras + * Copyright (C) 1992-2010 Jean_Pierre Charras * Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors. * * This program is free software; you can redistribute it and/or @@ -82,13 +82,12 @@ static std::vector s_HoleListBuffer; -/* This function displays and deletes the dialog frame for drill tools +/* This function displays the dialog frame for drill tools */ void WinEDA_PcbFrame::InstallDrillFrame( wxCommandEvent& event ) { - DIALOG_GENDRILL* frame = new DIALOG_GENDRILL( this ); - frame->ShowModal(); - frame->Destroy(); + DIALOG_GENDRILL dlg( this ); + dlg.ShowModal(); } diff --git a/pcbnew/gendrill.h b/pcbnew/gendrill.h index 70a62abfe0..f5c3167a92 100644 --- a/pcbnew/gendrill.h +++ b/pcbnew/gendrill.h @@ -1,6 +1,29 @@ /******************************************************************************/ /* classes and functions declaration used in drill file and report generation */ /******************************************************************************/ +/* + * This program source code file is part of KICAD, a free EDA CAD application. + * + * Copyright (C) 1992-2010 Jean_Pierre Charras + * Copyright (C) 1992-2010 Kicad Developers, see change_log.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 + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ #ifndef _GENDRILL_H_ #define _GENDRILL_H_