{
if(priorities[j] == i)
{
+//EED 2017-03-28
+#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41
+ out << "include " << package_name << "/boxes/" << files[j].filename() << std::endl;
+#else
out << "include " << package_name << "/boxes/" << files[j].filename().string() << std::endl;
+#endif
+
out << "#-----------------------------------------" << std::endl;
}
}
if(bf::exists(pth) && bf::is_directory(pth))
{
bf::directory_iterator end_itr;
- for(bf::directory_iterator itr(pth); itr != end_itr; ++itr)
+ bf::directory_iterator itr(pth);
+ for(itr; itr != end_itr; ++itr)
{
if(!is_directory(itr->status()))
{
+//EED 2017-03-28
+#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41
+ std::string nm(itr->path().filename());
+#else
std::string nm(itr->path().filename().string());
+#endif
if(nm.substr(nm.size()-4) == ".bbs")
{
//std::cout << itr->path().filename().string() << std::endl;
// Order files by name
for (int i = 0; i < (int)files.size()-1; ++i) {
for (int j = i+1; j < (int)files.size(); ++j) {
+
+//EED 2017-03-28
+#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41
+ if(files[j].filename() < files[i].filename())
+#else
if(files[j].filename().string() < files[i].filename().string())
+#endif
+
{
bf::path tmp = files[i];
files[i] = files[j];
std::vector< std::string > lstIn,
int typeForm );
~ComboBoxWidget();
- void OnComboBox(int iSelection);
+ void OnComboBoxSelection(int iSelection);
void OnComboBox(wxEvent& event);
void FillItems( int iSelection, std::vector< std::string > lstIn);
//--------------------------------------------------------------------------
- void ComboBoxWidget::OnComboBox(int iSelection)
+ void ComboBoxWidget::OnComboBoxSelection(int iSelection)
{
mBox->bbSetInputSelection( iSelection );
mBox->bbSetOutputOut( iSelection );
} else {
iSelection = wxchoice->GetSelection();
}
- OnComboBox(iSelection);
+ OnComboBoxSelection(iSelection);
}
//--------------------------------------------------------------------------
void ComboBoxWidget::FillItems(
{
// Get black box from
BlackBox::Pointer from = c->GetConnection()->GetBlackBoxFrom();
- WidgetBlackBox<wxWindow>::Pointer wfrom = boost::dynamic_pointer_cast<WidgetBlackBox<wxWindow> >(from);
+ bbtk::WidgetBlackBox<wxWindow>::Pointer wfrom = boost::dynamic_pointer_cast<bbtk::WidgetBlackBox<wxWindow> >(from);
vecTitle.push_back( wfrom->bbGetInputWinTitle() );
} // if c
} // for iWidget