}
//=========================================================================
-void wxGUIEditorGraphicBBS::initToolbar() {
+void wxGUIEditorGraphicBBS::initToolbar()
+{
wxBitmap bmp_new(new_xpm);
wxBitmap bmp_open(open_xpm);
wxBitmap bmp_save(save_xpm);
wxBitmap bmp_redo(redo_xpm);
wxBitmap bmp_editProperties(editProperties_xpm);
wxBitmap bmp_showTree(showTree_xpm);
- wxToolBar *toolbar = new wxToolBar(this, wxID_ANY);
+
+// wxToolBar *toolbar = new wxToolBar(this, wxID_ANY);
+ wxToolBar *toolbar = CreateToolBar();
//Adds a tool btn to the toolbar
toolbar->AddTool(ID_NEW, _T("New"), bmp_new, wxNullBitmap, wxITEM_NORMAL,
_T("New tab"), _T("Create a new panel tab"));
+
toolbar->AddTool(ID_OPEN, _T("Open diagram"), bmp_open, wxNullBitmap,
wxITEM_NORMAL, _T("Open a diagram"), _T("Open a diagram"));
+
toolbar->AddTool(ID_SAVE_DIAGRAM, _T("Save Diagram"), bmp_save,
wxNullBitmap, wxITEM_NORMAL, _T("Saves the current diagram"),
_T("Saves the current diagram")); //DFCH
toolbar->AddSeparator();
toolbar->AddTool(ID_BTNCOMPLEXBOX, _T("Complex box"), complexbox_xpm,
wxNullBitmap, wxITEM_NORMAL, _T("Complex box"), _T("Complex box"));
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
toolbar->SetToggle(ID_BTNCOMPLEXBOX, true);
+#else
+ printf ("EED Warnning. wxGUIEditorGraphicBBS::initToolbar >>> toolbar->SetToggle \n ");
+ // ..
+#endif
// RaC 2012 2nd HackFest - Now Complex inputs are any external input
// toolbar->AddTool(ID_ADDCOMPLEXBOXINPUT, _T("Add input to Complex box"),
toolbar->EnableTool(ID_EDITPROPERTIES, false);
toolbar->AddTool(ID_SHOWTREE, _T("Show tree"),bmp_showTree, wxNullBitmap, wxITEM_NORMAL, _T("Show tree"), _T("Show tree"));
+
toolbar->EnableTool(ID_UNDO, false);
toolbar->EnableTool(ID_REDO, false);
toolbar->Realize();
SetToolBar(toolbar);
+
// connect command event handlers
Connect(ID_EDITPROPERTIES,wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditDiagramProperties));
Connect(ID_SHOWTREE,wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnShowTree));
+
}
//=========================================================================
void wxGUIEditorGraphicBBS::initHelpHTMLBrowser() {
command += " & ";
#endif
+#ifdef __APPLE__
+ command = "source ~/.bbtk/profile_creatools; "+command;
+#endif
+
+
printf("RaC wxGUIEditorGraphicBBS::executeScript %s \n", command.c_str());
system(command.c_str());
}
descriptor = mapDesc[boxType];
bool result=false;
-
- if (
- ((descriptor->IsTypeOfScript_Application()==true) && (scriptApplication==true))
- ||
- ((descriptor->IsTypeOfScript_ComplexBox()==true) && (scriptComplexBox==true))
- )
+ descriptor->IsTypeOfScript_Application();
+ if (descriptor!=NULL)
{
- result=true;
- OpenScript(descriptor->GetScriptFileName(),boxType);
- }
+ if (
+ ((descriptor->IsTypeOfScript_Application()==true) && (scriptApplication==true))
+ ||
+ ((descriptor->IsTypeOfScript_ComplexBox()==true) && (scriptComplexBox==true))
+ )
+ {
+ result=true;
+ OpenScript(descriptor->GetScriptFileName(),boxType);
+ } // if descriptor Type
+ } else {
+ printf("EED ERROR wxGUIEditorGraphicBBS::TryToOpenScript >> The descriptor of this box not exists (packageName:%s boxType:%s) this is not normal\n",packageName.c_str(), boxType.c_str() );
+ } // if descriptor NULL
return result;
}