}
//=========================================================================
-void wxGUIEditorGraphicBBS::initToolbar() {
+void wxGUIEditorGraphicBBS::initToolbar()
+{
wxBitmap bmp_new(new_xpm);
wxBitmap bmp_open(open_xpm);
wxBitmap bmp_save(save_xpm);
//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() {
//=========================================================================
void wxGUIEditorGraphicBBS::OnOpenBBS(wxCommandEvent& event)
{
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog * openFileDialog = new wxFileDialog(this, wxT("Open BBS"), wxEmptyString, wxT("NewBBS"), wxT("*.bbs"), wxOPEN);
+#else
+ wxFileDialog * openFileDialog = new wxFileDialog(this, wxT("Open BBS"), wxEmptyString, wxT("NewBBS"), wxT("*.bbs"), wxFD_OPEN);
+#endif
if (openFileDialog->ShowModal() == wxID_OK)
{
}
void wxGUIEditorGraphicBBS::OnSaveActualBBS(wxCommandEvent& event) {
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog * saveFileDialog = new wxFileDialog(this,
wxT("Save actual BBS"), wxEmptyString, wxT("NewBBS"),
wxT("*.bbs"), wxSAVE | wxOVERWRITE_PROMPT);
+#else
+ wxFileDialog * saveFileDialog = new wxFileDialog(this,
+ wxT("Save actual BBS"), wxEmptyString, wxT("NewBBS"),
+ wxT("*.bbs"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+#endif
+
if (saveFileDialog->ShowModal() == wxID_OK) {
wxString fileName = saveFileDialog->GetPath();
std::string filename = (const char*) (fileName.mb_str());
//=========================================================================
-void wxGUIEditorGraphicBBS::OnSaveActualComplexBox(wxCommandEvent& event) {
+void wxGUIEditorGraphicBBS::OnSaveActualComplexBox(wxCommandEvent& event)
+{
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog * saveFileDialog = new wxFileDialog(this,
wxT("Save Complex Box BBS"), wxEmptyString,
_T("ComplexBoxName"), wxT("*.bbs"), wxSAVE
| wxOVERWRITE_PROMPT);
+#else
+ wxFileDialog * saveFileDialog = new wxFileDialog(this,
+ wxT("Save Complex Box BBS"), wxEmptyString,
+ _T("ComplexBoxName"), wxT("*.bbs"), wxFD_SAVE
+ | wxFD_OVERWRITE_PROMPT);
+#endif
+
if (saveFileDialog->ShowModal() == wxID_OK) {
wxString fileName = saveFileDialog->GetPath();
std::string filename = (const char*) (fileName.mb_str());
//The following method allows to save the current diagram asking the filename
//DFCH
-void wxGUIEditorGraphicBBS::SaveCurrentDiagramAs() {
+void wxGUIEditorGraphicBBS::SaveCurrentDiagramAs()
+{
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog * saveFileDialog = new wxFileDialog(this,
wxT("Save current diagram"), wxEmptyString, wxT("NewDiagram"),
wxT("*.bbg"), wxSAVE | wxOVERWRITE_PROMPT);
+#else
+ wxFileDialog * saveFileDialog = new wxFileDialog(this,
+ wxT("Save current diagram"), wxEmptyString, wxT("NewDiagram"),
+ wxT("*.bbg"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+#endif
+
if (saveFileDialog->ShowModal() == wxID_OK) {
//_tabsMgr->SetNameTabPanel(saveFileDialog->GetFilename());
wxString pathfileName = saveFileDialog->GetPath();
//=========================================================================
void wxGUIEditorGraphicBBS::OnExportConsoleExecCommand(wxCommandEvent& event)
{
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog * saveFileDialog = new wxFileDialog(this,
wxT("Export console command"), wxEmptyString, wxT("ConsoleApp.txt"),
wxT("*.txt;*.bbs;*.bbg;*.sh;*.bat"), wxSAVE | wxOVERWRITE_PROMPT);
+#else
+ wxFileDialog * saveFileDialog = new wxFileDialog(this,
+ wxT("Export console command"), wxEmptyString, wxT("ConsoleApp.txt"),
+ wxT("*.txt;*.bbs;*.bbg;*.sh;*.bat"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+#endif
+
if (saveFileDialog->ShowModal() == wxID_OK)
{
void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event)
{
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFileDialog * openFileDialog = new wxFileDialog(this, wxT("Open diagram"), wxEmptyString, wxT(""), wxT("*.bbg"), wxOPEN | wxFILE_MUST_EXIST);
+#else
+ wxFileDialog * openFileDialog = new wxFileDialog(this, wxT("Open diagram"), wxEmptyString, wxT(""), wxT("*.bbg"), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+#endif
+
if (openFileDialog->ShowModal() == wxID_OK)
{
wxString filePath = openFileDialog->GetPath();